diff --git a/modules/cms/classes/CmsObjectQuery.php b/modules/cms/classes/CmsObjectQuery.php
index 0d236061e..529f6ee28 100644
--- a/modules/cms/classes/CmsObjectQuery.php
+++ b/modules/cms/classes/CmsObjectQuery.php
@@ -69,6 +69,9 @@ class CmsObjectQuery
      */
     public function find($fileName)
     {
+        if (!$this->theme)
+            $this->inEditTheme();
+
         if ($this->useCache)
             return forward_static_call([$this->cmsObject, 'loadCached'], $this->theme, $fileName);
         else