diff --git a/app/views/templates/reshare.jst b/app/views/templates/reshare.jst
index 7b297db7a..899964248 100644
--- a/app/views/templates/reshare.jst
+++ b/app/views/templates/reshare.jst
@@ -27,7 +27,7 @@
       </div>
 
       <!-- duplicate from statusmessage partial -->
-      <% if(root.photos_count > 0) { %>
+      <% if(root.photos_count > 0 && root.photos && root.photos.length > 0) { %>
         <div class="photo_attachments">
           <img src="<%= root.photos[0].sizes.large %>" class="stream-photo big_stream_photo">
           <% for(photo in root.photos) {
diff --git a/app/views/templates/status_message.jst b/app/views/templates/status_message.jst
index f05205a91..aff46c0b2 100644
--- a/app/views/templates/status_message.jst
+++ b/app/views/templates/status_message.jst
@@ -1,4 +1,4 @@
-<% if(photos_count > 0) { %>
+<% if(photos_count > 0 && photos.length > 0) { %>
   <div class="photo_attachments">
     <a href="#" class="stream-photo-link">
       <img src="<%= photos[0].sizes.large %>" class="stream-photo big_stream_photo" data-small-photo="<%= photos[0].sizes.small %>" data-full-photo="<%= photos[0].sizes.large %>" rel="lightbox">