diff --git a/src/Umbraco.Web.UI.Client/gulp/config.js b/src/Umbraco.Web.UI.Client/gulp/config.js
index a807d63f5f..92e0b6d21d 100755
--- a/src/Umbraco.Web.UI.Client/gulp/config.js
+++ b/src/Umbraco.Web.UI.Client/gulp/config.js
@@ -3,10 +3,12 @@
 module.exports = {
     compile: {
         build: {
-            sourcemaps: false
+            sourcemaps: false,
+            embedtemplates: true
         },
         dev: {
-            sourcemaps: true
+            sourcemaps: true,
+            embedtemplates: false
         }
     },
     sources: {
diff --git a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
index e3e393b661..67dd6dd420 100644
--- a/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
+++ b/src/Umbraco.Web.UI.Client/gulp/util/processJs.js
@@ -25,7 +25,9 @@ module.exports = function (files, out) {
         .pipe(sort());
     
     //in production, embed the templates
-    task = task.pipe(embedTemplates({ basePath: "./src/", minimize: { loose: true } }))
+    if(config.compile.current.embedtemplates === true) {
+        task = task.pipe(embedTemplates({ basePath: "./src/", minimize: { loose: true } }));
+    }
     
     task = task.pipe(concat(out))
         .pipe(wrap('(function(){\n%= body %\n})();'))