diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php
index 110d47dfe..24f05eafe 100644
--- a/modules/cms/classes/Theme.php
+++ b/modules/cms/classes/Theme.php
@@ -524,6 +524,19 @@ class Theme
         return ThemeData::forTheme($this);
     }
 
+    /**
+     * Remove data specific to this theme
+     * @return bool
+     */
+    public function removeCustomData()
+    {
+        if ($this->hasCustomData()) {
+            return $this->getCustomData()->delete();
+        }
+
+        return true;
+    }
+
     /**
      * Checks to see if the database layer has been enabled
      *
diff --git a/modules/cms/classes/ThemeManager.php b/modules/cms/classes/ThemeManager.php
index d7035a084..20de61a25 100644
--- a/modules/cms/classes/ThemeManager.php
+++ b/modules/cms/classes/ThemeManager.php
@@ -107,6 +107,8 @@ class ThemeManager
             throw new ApplicationException(trans('cms::lang.theme.delete_active_theme_failed'));
         }
 
+        $theme->removeCustomData();
+
         /*
          * Delete from file system
          */