diff --git a/judge/views/contests.py b/judge/views/contests.py
index e1ca582..f60032f 100644
--- a/judge/views/contests.py
+++ b/judge/views/contests.py
@@ -417,13 +417,14 @@ class ContestMixin(object):
             self.request.user
         )
         context["logo_override_image"] = self.object.logo_override_image
+
         if (
             not context["logo_override_image"]
             and self.object.organizations.count() == 1
         ):
-            context[
-                "logo_override_image"
-            ] = self.object.organizations.first().organization_image.url
+            org_image = self.object.organizations.first().organization_image
+            if org_image:
+                context["logo_override_image"] = org_image.url
 
         return context
 
diff --git a/templates/site-logo-fragment.html b/templates/site-logo-fragment.html
index 8133b6f..7b47f7b 100644
--- a/templates/site-logo-fragment.html
+++ b/templates/site-logo-fragment.html
@@ -1,6 +1,6 @@
 {% if request.in_contest_mode and request.participation.contest.logo_override_image %}
   <img src="{{ request.participation.contest.logo_override_image|camo }}" alt="{{ SITE_NAME }}" height="44" style="border: none">
-{% elif request.organization %}
+{% elif request.organization and request.organization.organization_image %}
   <img src="{{ request.organization.organization_image.url|camo }}" alt="{{ SITE_NAME }}" height="44" style="border: none">
 {% elif organization_image is defined and organization_image %}
   <img src="{{ organization_image.url|camo }}" alt="{{ SITE_NAME }}" height="44" style="border: none">