diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
index a14d7d7b..1b1c69f6 100644
--- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html
@@ -19,7 +19,7 @@
 {% from "mediagoblin/utils/pagination.html" import render_pagination %}
 
 {% block object_gallery_content -%}
-  {% if media_entries %}
+  {% if media_entries and media_entries.count() %}
     {% for entry in media_entries %}
       <div class="media_thumbnail">
         <a href="{{ entry.url_for_self(request.urlgen) }}">
@@ -35,7 +35,7 @@
     {% endif %}
   {% else %}
     <p>
-      <i>There doesn't seem to be anything here...</i>
+      <i>There doesn't seem to be any media here yet...</i>
     </p>
   {% endif %}
 {% endblock %}