diff --git a/src/servers/app/server/ServerWindow.cpp b/src/servers/app/server/ServerWindow.cpp
index f74bd9b743..19a90570e8 100644
--- a/src/servers/app/server/ServerWindow.cpp
+++ b/src/servers/app/server/ServerWindow.cpp
@@ -999,6 +999,7 @@ void ServerWindow::DispatchMessage(int32 code, LinkMsgReader &link)
 			
 			LayerData		*ld = cl->fLayerData;
 			cl->fLayerData	= cl->fLayerData->prevState;
+			ld->prevState = NULL;
 			delete ld;
 			
 			cl->RebuildFullRegion();