diff --git a/app/js/directives.js b/app/js/directives.js
index 9e9a9f7d..158a9f1f 100644
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -1013,13 +1013,14 @@ angular.module('myApp.directives', ['myApp.filters'])
         });
       })
 
-      var cleanup = angular.noop;
-      // function () {
-      //   setTimeout(function () {
-      //     $scope.$destroy()
-      //     stopWatching();
-      //   }, 0);
-      // };
+      var cleanup = attrs.watch
+            ? angular.noop
+            : function () {
+                setTimeout(function () {
+                  $scope.$destroy()
+                  stopWatching();
+                }, 0);
+              };
     }
 
   })
@@ -1550,7 +1551,7 @@ angular.module('myApp.directives', ['myApp.filters'])
 
   })
 
-  
+
   .directive('myUserLink', function ($window, $timeout, $rootScope, AppUsersManager) {
 
     return {
diff --git a/app/partials/chat_modal.html b/app/partials/chat_modal.html
index 8c984dff..d82a1ade 100644
--- a/app/partials/chat_modal.html
+++ b/app/partials/chat_modal.html
@@ -10,6 +10,7 @@
         <img
           class="user_modal_image"
           my-load-thumb
+          watch="true"
           thumb="chatFull.thumb"
         />
       </div>
@@ -101,4 +102,4 @@
 
   </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/app/partials/dialog.html b/app/partials/dialog.html
index 8f17d7ab..208e1a2c 100644
--- a/app/partials/dialog.html
+++ b/app/partials/dialog.html
@@ -17,6 +17,7 @@
     <img
       class="im_dialog_photo"
       my-load-thumb
+      watch="true"
       thumb="dialogMessage.peerPhoto"
     />
   </div>
diff --git a/app/partials/head.html b/app/partials/head.html
index 2fb28108..4be619eb 100644
--- a/app/partials/head.html
+++ b/app/partials/head.html
@@ -5,6 +5,7 @@
       <a class="navbar-peer-wrap" ng-click="showPeerInfo()">
         <img
           my-load-thumb
+          watch="true"
           thumb="historyPeer.photo"
         />
       </a>
diff --git a/app/partials/im.html b/app/partials/im.html
index 1fc43112..871d37f0 100644
--- a/app/partials/im.html
+++ b/app/partials/im.html
@@ -206,6 +206,7 @@
                     <img
                       class="im_panel_peer_photo"
                       my-load-thumb
+                      watch="true"
                       thumb="historyPeer.photo"
                     />
                     <i class="icon im_panel_peer_online" ng-show="historyPeer.id > 0 &amp;&amp; historyPeer.data.status._ == 'userStatusOnline'"></i>
@@ -214,6 +215,7 @@
                     <img
                       class="im_panel_own_photo"
                       my-load-thumb
+                      watch="true"
                       thumb="ownPhoto"
                     />
                   </div>
@@ -263,4 +265,3 @@
 </div>
 
 <div id="notify_sound"></div>
-
diff --git a/app/partials/settings_modal.html b/app/partials/settings_modal.html
index c1f6dec4..1b6a7eb4 100644
--- a/app/partials/settings_modal.html
+++ b/app/partials/settings_modal.html
@@ -10,6 +10,7 @@
         <img
           class="user_modal_image"
           my-load-thumb
+          watch="true"
           thumb="photo"
         />
       </a>