diff --git a/configs/client-default.js b/configs/client-default.js
index 4d7182d6..f5788982 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -302,7 +302,7 @@ module.exports = function(options) {
         {
             packagePath: "plugins/c9.ide.language/language",
             workspaceDir: workspaceDir,
-            staticPrefix: options.packed ? staticPrefix : options.baseUrl + staticPrefix,
+            staticPrefix: options.packed || !options.baseUrl ? staticPrefix : options.baseUrl + staticPrefix,
             workerPrefix: options.CORSWorkerPrefix // "/static/standalone/worker"
         },
         "plugins/c9.ide.language/keyhandler",