diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index d288c892..21049230 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -82,7 +82,7 @@
         {% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
             <a class="navbar-brand p-0 me-2 justify-content-center" href="{% base_path request 'base' %}"
                aria-label="Tandoor">
-                <img class="brand-icon" src="{% static 'assets/brand_logo.png' %}" alt="Logo">
+                <img class="brand-icon" src="{% logo_url request %}" alt="Logo">
             </a>
         {% endif %}
     {% endif %}
@@ -96,7 +96,7 @@
         {% if not request.user.is_authenticated or request.user.userpreference.theme == request.user.userpreference.TANDOOR %}
             <a class="navbar-brand p-0 me-2 justify-content-center" href="{% base_path request 'base' %}"
                aria-label="Tandoor">
-                <img class="brand-icon" src="{% static 'assets/brand_logo.png' %}" alt="Logo">
+                <img class="brand-icon" src="{% logo_url request %}" alt="Logo">
             </a>
         {% endif %}
     {% endif %}
diff --git a/cookbook/templatetags/theming_tags.py b/cookbook/templatetags/theming_tags.py
index 79175be2..8ec04c23 100644
--- a/cookbook/templatetags/theming_tags.py
+++ b/cookbook/templatetags/theming_tags.py
@@ -25,6 +25,14 @@ def theme_url(request):
         raise AttributeError
 
 
+@register.simple_tag
+def logo_url(request):
+    if request.user.is_authenticated and request.space.image:
+        return request.space.image.file.url
+    else:
+        return static('assets/brand_logo.png')
+
+
 @register.simple_tag
 def nav_color(request):
     if not request.user.is_authenticated: