diff --git a/plugins/c9.vfs.client/endpoint.js b/plugins/c9.vfs.client/endpoint.js
index 2fa4bb77..f97b8e36 100644
--- a/plugins/c9.vfs.client/endpoint.js
+++ b/plugins/c9.vfs.client/endpoint.js
@@ -255,8 +255,10 @@ define(function(require, exports, module) {
                         return;
                     }
 
-                    var vfs = rememberVfs(server, res.vfsid);
-                    callback(null, vfs.vfsid, server.url, server.region);
+                    if (!foundServer) {
+                        var vfs = rememberVfs(server, res.vfsid);
+                        callback(null, vfs.vfsid, server.url, server.region);
+                    }
                 });
             }