diff --git a/src/p_maputl.cpp b/src/p_maputl.cpp
index e6b39e586..31ab08496 100644
--- a/src/p_maputl.cpp
+++ b/src/p_maputl.cpp
@@ -343,6 +343,16 @@ void AActor::UnlinkFromWorld (FLinkContext *ctx)
 		}
 		BlockNode = NULL;
 	}
+	ClearRenderSectorList();
+	ClearRenderLineList();
+}
+
+DEFINE_ACTION_FUNCTION(AActor, UnlinkFromWorld)
+{
+	PARAM_SELF_PROLOGUE(AActor);
+	PARAM_POINTER_DEF(ctx, FLinkContext);
+	self->UnlinkFromWorld(ctx); // fixme
+	return 0;
 }
 
 
@@ -429,15 +439,6 @@ bool AActor::FixMapthingPos()
 	return success;
 }
 
-DEFINE_ACTION_FUNCTION(AActor, UnlinkFromWorld)
-{
-	PARAM_SELF_PROLOGUE(AActor);
-	PARAM_POINTER_DEF(ctx, FLinkContext);
-	self->UnlinkFromWorld(ctx); // fixme
-	return 0;
-}
-
-
 //==========================================================================
 //
 // P_SetThingPosition