diff --git a/Source/Engine/Terrain/Terrain.cpp b/Source/Engine/Terrain/Terrain.cpp
index c405b390e..4907d0f8a 100644
--- a/Source/Engine/Terrain/Terrain.cpp
+++ b/Source/Engine/Terrain/Terrain.cpp
@@ -559,6 +559,12 @@ void Terrain::Draw(RenderContext& renderContext)
 
 void Terrain::DrawGeneric(RenderContext& renderContext)
 {
+    // Prevent issues if no BeginPlay was called
+    if (!IsDuringPlay())
+    {
+        CacheNeighbors();
+    }
+
     Draw(renderContext);
 }