diff --git a/lnbits/helpers.py b/lnbits/helpers.py
index 3af653b8..8b40582a 100644
--- a/lnbits/helpers.py
+++ b/lnbits/helpers.py
@@ -59,15 +59,15 @@ def template_renderer(additional_folders: Optional[List] = None) -> Jinja2Templa
     if settings.lnbits_custom_logo:
         t.env.globals["USE_CUSTOM_LOGO"] = settings.lnbits_custom_logo
 
-    if settings.debug:
+    if settings.bundle_assets:
+        t.env.globals["INCLUDED_JS"] = ["/static/bundle.min.js"]
+        t.env.globals["INCLUDED_CSS"] = ["/static/bundle.min.css"]
+    else:
         vendor_filepath = Path(settings.lnbits_path, "static", "vendor.json")
         with open(vendor_filepath) as vendor_file:
             vendor_files = json.loads(vendor_file.read())
             t.env.globals["INCLUDED_JS"] = vendor_files["js"]
             t.env.globals["INCLUDED_CSS"] = vendor_files["css"]
-    else:
-        t.env.globals["INCLUDED_JS"] = ["/static/bundle.min.js"]
-        t.env.globals["INCLUDED_CSS"] = ["/static/bundle.min.css"]
 
     return t
 
diff --git a/lnbits/settings.py b/lnbits/settings.py
index e4df2772..fcbab629 100644
--- a/lnbits/settings.py
+++ b/lnbits/settings.py
@@ -227,6 +227,7 @@ class EditableSettings(
 
 class EnvSettings(LNbitsSettings):
     debug: bool = Field(default=False)
+    bundle_assets: bool = Field(default=True)
     host: str = Field(default="127.0.0.1")
     port: int = Field(default=5000)
     forwarded_allow_ips: str = Field(default="*")