diff --git a/src/vs/editor/browser/standalone/standaloneServices.ts b/src/vs/editor/browser/standalone/standaloneServices.ts
index 4225f546ad117ab48d2ab2c06da84f23e6feab99..65f02d80b1141fcf32034d8229d6b0c9902de1f0 100644
--- a/src/vs/editor/browser/standalone/standaloneServices.ts
+++ b/src/vs/editor/browser/standalone/standaloneServices.ts
@@ -106,19 +106,13 @@ export function ensureStaticPlatformServices(services: IEditorOverrideServices):
 
 	var statics = getOrCreateStaticServices(services);
 
-	services.threadService = services.threadService || statics.threadService;
-	services.extensionService = services.extensionService || statics.extensionService;
-	services.modeService = services.modeService || statics.modeService;
-	services.contextService = services.contextService || statics.contextService;
-	services.telemetryService = services.telemetryService || statics.telemetryService;
-	services.requestService = services.requestService || statics.requestService;
-	services.messageService = services.messageService || statics.messageService;
-	services.modelService = services.modelService || statics.modelService;
-	services.codeEditorService = services.codeEditorService || statics.codeEditorService;
-	services.editorWorkerService = services.editorWorkerService || statics.editorWorkerService;
-	services.eventService = services.eventService || statics.eventService;
-	services.markerService = services.markerService || statics.markerService;
-	services.instantiationService = statics.instantiationService;
+	for (var serviceId in statics) {
+		if (statics.hasOwnProperty(serviceId)) {
+			if (!services.hasOwnProperty(serviceId)) {
+				services[serviceId] = statics[serviceId];
+			}
+		}
+	}
 
 	return services;
 }