diff --git a/ide/che-ide-gwt-app/src/main/resources/org/eclipse/che/ide/public/loader.html b/ide/che-ide-gwt-app/src/main/resources/org/eclipse/che/ide/public/loader.html
index 3dcd18ef0a..6892751fe7 100644
--- a/ide/che-ide-gwt-app/src/main/resources/org/eclipse/che/ide/public/loader.html
+++ b/ide/che-ide-gwt-app/src/main/resources/org/eclipse/che/ide/public/loader.html
@@ -172,7 +172,19 @@
                     return;
                 }
 
-                const server = workspace.runtime.links.find(link => redirectUrl.startsWith(link));
+                var machines = Object.keys(workspace.runtime.machines)
+                    .map(machineName => workspace.runtime.machines[machineName]);
+                var servers = machines.map(machine => {
+                    const servers = Object.keys(machine.servers)
+                        .map(serverName => machine.servers[serverName]);
+                    return servers;
+                }).reduce((servers, machineServers) => {
+                    return servers.concat(...machineServers);
+                }, []);
+                var server = servers.find(_server => {
+                    return _server.url && redirectUrl.startsWith( _server.url);
+                });
+
                 if (server) {
                     resolve(server);
                 } else {