diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 98c9fbb1..87f82cde 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -29,6 +29,7 @@
 //= require markdown
 //= require momentjs
 //= require leaflet
+//= require holderjs
 //= require bootstrap-datetimepicker
 //= require osem-datepickers
 //= require osem-datatables
diff --git a/app/views/admin/venues/show.html.haml b/app/views/admin/venues/show.html.haml
index 00885085..17404040 100644
--- a/app/views/admin/venues/show.html.haml
+++ b/app/views/admin/venues/show.html.haml
@@ -7,7 +7,12 @@
 -if @venue
   .row
     .col-md-6
-      =image_tag(@conference.venue.photo, class: 'img-responsive img-rounded') unless @conference.venue.photo.blank?
+      - if @conference.venue.location?
+        = render 'conference/venue_map'
+      - elsif @conference.venue.photo.blank?
+        %img{ "data-src" => "holder.js/300x200?text=No Image Set", class: 'img-responsive img-rounded' }
+      - elsif !@conference.venue.photo.blank?
+        =image_tag(@conference.venue.photo, class: 'img-responsive img-rounded')
     .col-md-6
       %address
         %strong