diff --git a/src/Ombi.Core/Senders/TvSender.cs b/src/Ombi.Core/Senders/TvSender.cs
index c94935a31..9fc971ab5 100644
--- a/src/Ombi.Core/Senders/TvSender.cs
+++ b/src/Ombi.Core/Senders/TvSender.cs
@@ -206,15 +206,19 @@ namespace Ombi.Core.Senders
             // Overrides on the request take priority
             if (model.ParentRequest.QualityOverride.HasValue)
             {
-                var overrideQuality = model.ParentRequest.QualityOverride.Value;
-                if (overrideQuality > 0)
+                var qualityOverride = model.ParentRequest.QualityOverride.Value;
+                if (qualityOverride > 0)
                 {
-                    qualityToUse = overrideQuality;
+                    qualityToUse = qualityOverride;
                 }
             }
             if (model.ParentRequest.RootFolder.HasValue)
             {
-               rootFolderPath = await GetSonarrRootPath(model.ParentRequest.RootFolder.Value, s);
+                var rootfolderOverride = model.ParentRequest.RootFolder.Value;
+                if (rootfolderOverride > 0)
+                {
+                    rootFolderPath = await GetSonarrRootPath(rootfolderOverride, s);
+                }
             }
       
             // Are we using v3 sonarr?