diff --git a/selfdrive/frogpilot/assets/theme_manager.py b/selfdrive/frogpilot/assets/theme_manager.py
index a4848b53b77604..5a8905feedaafb 100644
--- a/selfdrive/frogpilot/assets/theme_manager.py
+++ b/selfdrive/frogpilot/assets/theme_manager.py
@@ -108,7 +108,15 @@ def update_wheel_image(image, holiday_theme="stock", random_event=True):
 
 class ThemeManager:
   def __init__(self):
-    self.theme_assets = {}
+    self.theme_assets = {
+      "holiday_theme": "stock",
+      "color_scheme": "stock",
+      "distance_icons": "stock",
+      "icon_pack": "stock",
+      "sound_pack": "stock",
+      "turn_signal_pack": "stock",
+      "wheel_image": "stock"
+    }
 
   @staticmethod
   def calculate_thanksgiving(year):
@@ -393,9 +401,6 @@ def validate_themes(self, frogpilot_toggles):
     }
 
     for theme_param, (theme_component, theme_name) in asset_mappings.items():
-      if not theme_name or theme_name == "stock":
-        continue
-
       if theme_component == "distance_icons":
         theme_path = os.path.join(THEME_SAVE_PATH, theme_component, theme_name)
       elif theme_component == "steering_wheels":
@@ -412,7 +417,6 @@ def validate_themes(self, frogpilot_toggles):
       if theme_path is None or not os.path.exists(theme_path):
         print(f"{theme_name} for {theme_component} not found. Downloading...")
         self.download_theme(theme_component, theme_name, theme_param)
-        self.theme_assets = {}
 
   def update_themes(self, frogpilot_toggles, boot_run=False):
     repo_url = get_repository_url()