diff --git a/templates/base.html.twig b/templates/base.html.twig
index 3b4cebba..e7c641c6 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -38,7 +38,7 @@
 
 
 
-        {% if not app.user.theme is defined %}
+        {% if not app.user.theme is defined or app.user.theme is null %}
             {% set theme = global_theme %}
         {% else %}
             {% set theme = app.user.theme %}