diff --git a/app/js/controllers.js b/app/js/controllers.js
index 874e5ab1..ea0aa30b 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -871,6 +871,13 @@ angular.module('myApp.controllers', [])
     $scope.photo = AppPhotosManager.wrapForFull($scope.photoID);
     $scope.nav = {};
 
+    if (!$scope.messageID) {
+      $scope.nav.next = function () {
+        $modalInstance.close();
+      }
+      return;
+    }
+
     var peerID = AppMessagesManager.getMessagePeer(AppMessagesManager.getMessage($scope.messageID)),
         inputPeer = AppPeersManager.getInputPeerByID(peerID),
         inputQuery = '',
@@ -996,6 +1003,7 @@ angular.module('myApp.controllers', [])
     $scope.progress = {enabled: false};
     $scope.player = {};
 
+
     $scope.forward = function () {
       var messageID = $scope.messageID;
       PeersSelectService.selectPeer().then(function (peerString) {
diff --git a/app/partials/photo_modal.html b/app/partials/photo_modal.html
index 27cae42e..6fb0061e 100644
--- a/app/partials/photo_modal.html
+++ b/app/partials/photo_modal.html
@@ -4,7 +4,7 @@
 
     <div class="photo_modal_image_wrap" my-load-full-photo full-photo="photo.full" thumb-location="photo.thumb.location" ng-click="nav.next()"> </div>
 
-    <div class="media_modal_actions pull-right">
+    <div class="media_modal_actions pull-right" ng-if="messageID">
       <a href="" class="media_modal_action_link" ng-click="forward()">Forward</a>
       <a href="" class="media_modal_action_link" ng-click="delete()">Delete</a>
     </div>
diff --git a/app/partials/video_modal.html b/app/partials/video_modal.html
index 280f23a4..07205626 100644
--- a/app/partials/video_modal.html
+++ b/app/partials/video_modal.html
@@ -4,7 +4,7 @@
 
     <div class="video_modal_image_wrap" my-load-video video="video"></div>
 
-    <div class="media_modal_actions pull-right">
+    <div class="media_modal_actions pull-right" ng-if="messageID">
       <a href="" class="media_modal_action_link" ng-click="forward()">Forward</a>
       <a href="" class="media_modal_action_link" ng-click="delete()">Delete</a>
     </div>