diff --git a/modules/core/client/directives/torrent-progress.client.directive.js b/modules/core/client/directives/torrent-progress.client.directive.js
index b542558e..ffb37ed5 100644
--- a/modules/core/client/directives/torrent-progress.client.directive.js
+++ b/modules/core/client/directives/torrent-progress.client.directive.js
@@ -20,9 +20,9 @@
 
     function link(scope, element, attrs) {
       scope.$watch(attrs.torrentProgress, function (p) {
-        if (p && p.length > 0) {
-          var pt = p[0];
-          //mtDebug.info(pt);
+        var pt = Array.isArray(p) ? (p.length > 0 ? p[0] : undefined) : p;
+        if (pt) {
+          mtDebug.info(pt);
 
           var t_progressbar = ngProgressFactory.createInstance();
           t_progressbar.setParent(element[0]);
diff --git a/modules/torrents/client/templates/torrent-item.client.view.html b/modules/torrents/client/templates/torrent-item.client.view.html
index c080ee13..d0db6324 100644
--- a/modules/torrents/client/templates/torrent-item.client.view.html
+++ b/modules/torrents/client/templates/torrent-item.client.view.html
@@ -276,6 +276,6 @@
 </tr>
 <tr>
     <td class="td-progress" colspan="6">
-        <div torrent-progress="item.my_peers"></div>
+        <div torrent-progress="item.my_peers || peer"></div>
     </td>
 </tr>