diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionView.js b/src/UI/Settings/Quality/Definition/QualityDefinitionView.js
index 003d6520d..d5a3f9d1a 100644
--- a/src/UI/Settings/Quality/Definition/QualityDefinitionView.js
+++ b/src/UI/Settings/Quality/Definition/QualityDefinitionView.js
@@ -9,7 +9,7 @@ define(
     ], function (Marionette, AsModelBoundView, fileSize) {
 
         var view = Marionette.ItemView.extend({
-            template: 'Settings/Quality/Definition/QualityDefinitionTemplate',
+            template: 'Settings/Quality/Definition/QualityDefinitionViewTemplate',
             className: 'row',
 
             ui: {
@@ -61,6 +61,14 @@ define(
                 }
                 
                 {
+                    if (maxSize === 0)
+                    {
+                        this.ui.thirtyMinuteMaxSize.html('Unlimited');
+                        this.ui.sixtyMinuteMaxSize.html('Unlimited');
+
+                        return;
+                    }
+
                     var maxBytes = maxSize * 1024 * 1024;
                     var maxThirty = fileSize(maxBytes * 30, 1, false);
                     var maxSixty = fileSize(maxBytes * 60, 1, false);
diff --git a/src/UI/Settings/Quality/Definition/QualityDefinitionTemplate.html b/src/UI/Settings/Quality/Definition/QualityDefinitionViewTemplate.html
similarity index 100%
rename from src/UI/Settings/Quality/Definition/QualityDefinitionTemplate.html
rename to src/UI/Settings/Quality/Definition/QualityDefinitionViewTemplate.html