diff --git a/EditorExtensions/Shared/Compilers/CssCompilerBase.cs b/EditorExtensions/Shared/Compilers/CssCompilerBase.cs
index 917c36c81..f22d2da66 100644
--- a/EditorExtensions/Shared/Compilers/CssCompilerBase.cs
+++ b/EditorExtensions/Shared/Compilers/CssCompilerBase.cs
@@ -49,9 +49,12 @@ protected override string PostProcessResult(string resultSource, string sourceFi
 
         private string UpdateSourceMapUrls(string content, string compiledFileName)
         {
-            if (!GenerateSourceMap || !File.Exists(compiledFileName))
+            if (!File.Exists(compiledFileName))
                 return content;
 
+            if (!GenerateSourceMap)
+                return _sourceMapInCss.Replace(content, string.Empty);
+
             string sourceMapFilename = compiledFileName + ".map";
 
             if (!File.Exists(sourceMapFilename))
diff --git a/EditorExtensions/Shared/Compilers/NodeExecutorBase.cs b/EditorExtensions/Shared/Compilers/NodeExecutorBase.cs
index 512a600d8..a84fa8c24 100644
--- a/EditorExtensions/Shared/Compilers/NodeExecutorBase.cs
+++ b/EditorExtensions/Shared/Compilers/NodeExecutorBase.cs
@@ -73,6 +73,9 @@ public async Task<CompilerResult> CompileAsync(string sourceFileName, string tar
             finally
             {
                 File.Delete(errorOutputFile);
+
+                if (!GenerateSourceMap)
+                    File.Delete(MapFileName);
             }
         }