diff --git a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java
index c19e14d2b04..ad5ad85877e 100644
--- a/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java
+++ b/rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/server/ServerReceiver.java
@@ -13,6 +13,7 @@
  * 
  * Contributors:
  * David McKnight   (IBM) - [225507][api][breaking] RSE dstore API leaks non-API types
+ * Noriaki Takatsu  (IBM) - [227905] prevent double invocations of finished in ConncetionEstablisher
  *******************************************************************************/
 
 package org.eclipse.dstore.core.server;
@@ -74,6 +75,7 @@ public class ServerReceiver extends Receiver
 	
 	public void finish()
 	{
+		_dataStore.setConnected(false);
 	    super.finish();
 	    _connection.finished(this);
 	}