diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java
index c3c5a34a3..f31954964 100644
--- a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java
+++ b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java
@@ -143,7 +143,9 @@ public class RemoteWorkspace implements Workspace {
     @Override
     public boolean equals(Object obj) {
 
-        return obj instanceof RemoteWorkspace && AssistUtils.equals(((RemoteWorkspace) obj).connection, this.connection);
+        return obj instanceof RemoteWorkspace
+                && AssistUtils.equals(((RemoteWorkspace) obj).connection, this.connection)
+                && AssistUtils.equals(((RemoteWorkspace) obj).client.getConnection(), this.client.getConnection());
     }
 
     public WorkspaceClient getClient(){