diff --git a/src/servers/app/ServerCursor.h b/src/servers/app/ServerCursor.h
index 70493224c8..4014d5fa90 100644
--- a/src/servers/app/ServerCursor.h
+++ b/src/servers/app/ServerCursor.h
@@ -105,11 +105,12 @@ public:
 							{
 								if (fCursor == cursor)
 									return;
-								if (fCursor)
-									fCursor->Release();
+								if (cursor)
+									cursor->Acquire();
+								ServerCursor* oldCursor = fCursor;
 								fCursor = cursor;
-								if (fCursor)
-									fCursor->Acquire();
+								if (oldCursor)
+									oldCursor->Release();
 							}
 	ServerCursor*			Cursor() const
 							{