diff --git a/src/UI/Cells/EpisodeStatusCell.js b/src/UI/Cells/EpisodeStatusCell.js
index 167ac8671..c8cd57510 100644
--- a/src/UI/Cells/EpisodeStatusCell.js
+++ b/src/UI/Cells/EpisodeStatusCell.js
@@ -50,15 +50,15 @@ define(
                         var title = 'Episode downloaded';
 
                         if (quality.proper) {
-                            title += ' [PROPER] - {0}'.format(size);
-                            this.$el.html('<span class="badge badge-info" title="{0}">{1}</span>'.format(title, quality.quality.name));
+                            title += ' [PROPER]';
                         }
 
-                        else {
+                        if (size !== '') {
                             title += ' - {0}'.format(size);
-                            this.$el.html('<span class="badge badge-inverse" title="{0}">{1}</span>'.format(title, quality.quality.name));
                         }
 
+                        this.$el.html('<span class="badge badge-inverse" title="{0}">{1}</span>'.format(title, quality.quality.name));
+
                         return;
                     }
 
diff --git a/src/UI/Shared/FormatHelpers.js b/src/UI/Shared/FormatHelpers.js
index 51e93cf5a..aaf51b1e1 100644
--- a/src/UI/Shared/FormatHelpers.js
+++ b/src/UI/Shared/FormatHelpers.js
@@ -10,6 +10,11 @@ define(
 
             bytes: function (sourceSize) {
                 var size = Number(sourceSize);
+
+                if (isNaN(size)) {
+                    return '';
+                }
+
                 return Filesize(size, { base: 2, round: 1 });
             },