diff --git a/src/vs/platform/remote/node/tunnelService.ts b/src/vs/platform/remote/common/tunnelService.ts
similarity index 75%
rename from src/vs/platform/remote/node/tunnelService.ts
rename to src/vs/platform/remote/common/tunnelService.ts
index f9126aa719d754854d991f2c64e33039335cb260..ac9f17c9077428d45a2a2bef02879db5e90d6f36 100644
--- a/src/vs/platform/remote/node/tunnelService.ts
+++ b/src/vs/platform/remote/common/tunnelService.ts
@@ -4,9 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITunnelService, RemoteTunnel } from 'vs/platform/remote/common/tunnel';
-import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 
-export class TunnelService implements ITunnelService {
+export class NoOpTunnelService implements ITunnelService {
 	_serviceBrand: undefined;
 
 	public constructor(
@@ -17,5 +16,3 @@ export class TunnelService implements ITunnelService {
 		return undefined;
 	}
 }
-
-registerSingleton(ITunnelService, TunnelService);
diff --git a/src/vs/workbench/browser/web.simpleservices.ts b/src/vs/workbench/browser/web.simpleservices.ts
index b02fbdb43fbc94e9eb762a9919d164fa75a23b52..3a836c8772b4c05bda7ea6f732d754e1939b647d 100644
--- a/src/vs/workbench/browser/web.simpleservices.ts
+++ b/src/vs/workbench/browser/web.simpleservices.ts
@@ -15,7 +15,6 @@ import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, IWorkspaceFolde
 import { IRecentlyOpened, IRecent, isRecentFile, isRecentFolder } from 'vs/platform/history/common/history';
 import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
 import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
-import { ITunnelService } from 'vs/platform/remote/common/tunnel';
 import { IWorkspaceContextService, WorkbenchState, IWorkspace } from 'vs/platform/workspace/common/workspace';
 import { addDisposableListener, EventType, windowOpenNoOpener } from 'vs/base/browser/dom';
 import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
@@ -683,19 +682,6 @@ registerSingleton(IWorkspacesService, SimpleWorkspacesService);
 
 //#endregion
 
-//#region remote
-
-class SimpleTunnelService implements ITunnelService {
-	_serviceBrand: undefined;
-	openTunnel(remotePort: number) {
-		return undefined;
-	}
-}
-
-registerSingleton(ITunnelService, SimpleTunnelService);
-
-//#endregion
-
 //#region workspace stats
 
 class SimpleWorkspaceStatsService implements IWorkspaceStatsService {
diff --git a/src/vs/workbench/workbench.web.main.ts b/src/vs/workbench/workbench.web.main.ts
index 0ddb319800292453e5344a39fb8e6ddfb0e2918f..c72bac33876d30fd0217f8364e8765ec0041abac 100644
--- a/src/vs/workbench/workbench.web.main.ts
+++ b/src/vs/workbench/workbench.web.main.ts
@@ -58,6 +58,8 @@ import { ContextMenuService } from 'vs/platform/contextview/browser/contextMenuS
 import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
 import { BackupFileService } from 'vs/workbench/services/backup/common/backupFileService';
 import { ExtensionManagementService } from 'vs/workbench/services/extensionManagement/common/extensionManagementService';
+import { ITunnelService } from 'vs/platform/remote/common/tunnel';
+import { NoOpTunnelService } from 'vs/platform/remote/common/tunnelService';
 
 registerSingleton(IRequestService, RequestService, true);
 registerSingleton(IExtensionManagementService, ExtensionManagementService);
@@ -67,6 +69,7 @@ registerSingleton(IClipboardService, BrowserClipboardService, true);
 registerSingleton(IAccessibilityService, BrowserAccessibilityService, true);
 registerSingleton(ILifecycleService, BrowserLifecycleService);
 registerSingleton(IContextMenuService, ContextMenuService);
+registerSingleton(ITunnelService, NoOpTunnelService, true);
 
 //#endregion