diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml
index e4dbf6c9..1a0b1d63 100644
--- a/app/views/conference/show.html.haml
+++ b/app/views/conference/show.html.haml
@@ -17,8 +17,9 @@
             .row-fluid
               .col-md-12.lead
                 %p= @conference.description
-          = link_to 'Gallery', fetch_gallery_photos_conference_path(@conference.id), class: 'btn btn-primary btn-lg', id: 'gallery-btn', remote: true
-          = render 'gallery'
+          -unless @conference.photos.blank?
+            = link_to 'Gallery', fetch_gallery_photos_conference_path(@conference.id), class: 'btn btn-primary btn-lg', id: 'gallery-btn', remote: true
+            = render 'gallery'
   - if @conference.include_program_in_splash?
     %section{ id: 'program' }
       .pad