diff --git a/infrablue/settings.py b/infrablue/settings.py
index 633b6626c815ce9a97e0b9850bdfb81016018061..15a859a743fc9246515fdddd193b6a58d2649898 100644
--- a/infrablue/settings.py
+++ b/infrablue/settings.py
@@ -343,4 +343,6 @@ if _settings.get("twilio.sid", None):
 ACCOUNT_ACTIVATION_DAYS = _settings.get("registration.activation_days", 7)
 REGISTRATION_OPEN = _settings.get("registration.allow", True)
 
-BBB_ROLE_CALLBACK = "infrablue.bigbluebutton.get_role"
\ No newline at end of file
+BBB_ROLE_CALLBACK = "infrablue.bigbluebutton.get_role"
+
+SERVE_STATIC = _settings.get("http.serve_static", True)
diff --git a/infrablue/urls.py b/infrablue/urls.py
index 26a5cb2b4ab28d8c99105d25a50f80c46932ff80..719cd4bcbc1386f070fd465a1a67fac0da65ec5b 100644
--- a/infrablue/urls.py
+++ b/infrablue/urls.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.auth import views as auth_views
 from django.urls import include, path
@@ -118,6 +119,9 @@ urlpatterns = [
     ),
 ]
 
+if settings.DEBUG or settings.SERVE_STATIC:
+    urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+
 if "social_django" in settings.INSTALLED_APPS:
     from social_django.urls import urlpatterns as social_urls  # noqa