diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java
index bf0c14d3e56..7ebbaf037c8 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/ServerCommandHandler.java
@@ -206,7 +206,7 @@ public class ServerCommandHandler extends CommandHandler
 			_serverIdleThread._serverTimedOut=true; // ensures that the wait loop won't continue after the interrupt
 			_serverIdleThread.interrupt();
 		}
-
+		_serverIdleThread = null;
 		if (_minerLoader != null)
 			_minerLoader.finishMiners();
 		super.finish();