diff --git a/flextype/Themes.php b/flextype/Themes.php
index 6ab30809..136a445e 100644
--- a/flextype/Themes.php
+++ b/flextype/Themes.php
@@ -74,7 +74,7 @@ class Themes
 
         // Get Theme mafifest file and write to site.themes array
         if (Cache::contains($theme_cache_id)) {
-            Registry::set('themes.'.Registry::get('site.theme'), Cache::fetch($theme_cache_id));
+            Registry::set('themes.'.Registry::get('system.theme'), Cache::fetch($theme_cache_id));
         } else {
             if (Filesystem::fileExists($theme_blueprints = PATH['themes'] . '/' . $theme . '/' . 'blueprints.yaml') and
                 Filesystem::fileExists($theme_config = PATH['themes'] . '/' . $theme . '/' . $theme . '.yaml')) {