diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
index 633443ef6f3b5e02098b6c1174ef09edbaeb86a5..b135cc0e823f6d52104483dbd355847dac5eb07e 100644
--- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
@@ -31,7 +31,12 @@ class StylesheetUIAssetMerger extends UIAssetMerger
     protected function getMergedAssets()
     {
         foreach($this->getAssetCatalog()->getAssets() as $uiAsset) {
-            $this->lessCompiler->addImportDir(dirname($uiAsset->getAbsoluteLocation()));
+
+            $content = $uiAsset->getContent();
+            if (false !== strpos($content, '@import')) {
+                $this->lessCompiler->addImportDir(dirname($uiAsset->getAbsoluteLocation()));
+            }
+
         }
 
         return $this->lessCompiler->compile($this->getConcatenatedAssets());