diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index 34dceea32..72b158572 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -205,6 +205,17 @@ class CombineAssets
         // Disable cache always
         $this->storagePath = null;
 
+        // Prefix all assets
+        if ($localPath) {
+            if (substr($localPath, -1) !== '/') {
+                $localPath = $localPath.'/';
+            }
+            $assets = array_map(function($asset) use ($localPath) {
+                if (substr($asset, 0, 1) === '@') return $asset;
+                return $localPath.$asset;
+            }, $assets);
+        }
+
         list($assets, $extension) = $this->prepareAssets($assets);
 
         $rewritePath = File::localToPublic(dirname($destination));