diff --git a/modules/cms/models/ThemeData.php b/modules/cms/models/ThemeData.php
index 52bc2337c..1df32f0b5 100644
--- a/modules/cms/models/ThemeData.php
+++ b/modules/cms/models/ThemeData.php
@@ -207,6 +207,11 @@ class ThemeData extends Model
     public static function applyAssetVariablesToCombinerFilters($filters)
     {
         $theme = CmsTheme::getActiveTheme();
+        
+        if(!$theme){
+            return;
+        }
+        
         if (!$theme->hasCustomData()) {
             return;
         }