diff --git a/Grayjay.ClientServer/Subscriptions/Algorithms/SmartSubscriptionAlgorithm.cs b/Grayjay.ClientServer/Subscriptions/Algorithms/SmartSubscriptionAlgorithm.cs
index 237475e0..8da3911e 100644
--- a/Grayjay.ClientServer/Subscriptions/Algorithms/SmartSubscriptionAlgorithm.cs
+++ b/Grayjay.ClientServer/Subscriptions/Algorithms/SmartSubscriptionAlgorithm.cs
@@ -88,7 +88,7 @@ public override List<SubscriptionTask> GetSubscriptionTasks(Dictionary<Subscript
                         else
                         {
                             if (peekTasks.Count < 100 && GrayjaySettings.Instance.Subscriptions.PeekChannelContents &&
-                                task.Sub.LastPeekVideo.Year < 1971 || task.Sub.LastPeekVideo < task.Sub.LastVideoUpdate &&
+                                (task.Sub.LastPeekVideo.Year < 1971 || task.Sub.LastPeekVideo < task.Sub.LastVideoUpdate) &&
                                 task.Client.Capabilities.HasPeekChannelContents && task.Client.GetPeekChannelTypes().Contains(task.Type))
                             {
                                 task.FromPeek = true;
diff --git a/Grayjay.ClientServer/Subscriptions/Algorithms/SubscriptionsTaskFetchAlgorithm.cs b/Grayjay.ClientServer/Subscriptions/Algorithms/SubscriptionsTaskFetchAlgorithm.cs
index f1d81e95..dda6aabb 100644
--- a/Grayjay.ClientServer/Subscriptions/Algorithms/SubscriptionsTaskFetchAlgorithm.cs
+++ b/Grayjay.ClientServer/Subscriptions/Algorithms/SubscriptionsTaskFetchAlgorithm.cs
@@ -318,12 +318,12 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
                                 SetProgress(finished, forkTasks.Count);
                                 if (!cachedChannels.Contains(task.Url))
                                 {
-                                    return new SubscriptionTaskResult(task, null, null);
+                                    cachedChannels.Add(task.Url);
+                                    return new SubscriptionTaskResult(task, StateCache.GetChannelCachePager(task.Url), null);
                                 }
                                 else
                                 {
-                                    cachedChannels.Add(task.Url);
-                                    return new SubscriptionTaskResult(task, StateCache.GetChannelCachePager(task.Url), null);
+                                    return new SubscriptionTaskResult(task, null, null);
                                 }
                             }
                         }
@@ -334,7 +334,6 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
                             return new SubscriptionTaskResult(task, null, null); //skipped
                         }
 
-                        Exception taskEx = null;
                         IPager<PlatformContent> pager = null;
                         try
                         {
@@ -390,8 +389,7 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
                             {
                                 Logger.i(nameof(StateSubscriptions), $"Channel {task.Sub.Channel.Name} failed, substituting with cache");
                                 pager = StateCache.GetChannelCachePager(task.Sub.Channel.Url);
-                                taskEx = ex;
-                                return new SubscriptionTaskResult(task, pager, taskEx);
+                                return new SubscriptionTaskResult(task, pager, null);
                             }
                         }
                     });
@@ -411,13 +409,13 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
                                 SetProgress(finished, forkTasks.Count);
                                 if (!cachedChannels.Contains(task.Url))
                                 {
-                                    source.SetResult(new SubscriptionTaskResult(task, null, null));
+                                    cachedChannels.Add(task.Url);
+                                    source.SetResult(new SubscriptionTaskResult(task, StateCache.GetChannelCachePager(task.Url), null));
                                     return;
                                 }
                                 else
                                 {
-                                    cachedChannels.Add(task.Url);
-                                    source.SetResult(new SubscriptionTaskResult(task, StateCache.GetChannelCachePager(task.Url), null));
+                                    source.SetResult(new SubscriptionTaskResult(task, null, null));
                                     return;
                                 }
                             }
@@ -430,7 +428,6 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
                             return;
                         }
 
-                        Exception taskEx = null;
                         IPager<PlatformContent> pager = null;
                         try
                         {
@@ -487,8 +484,7 @@ public List<Task<SubscriptionTaskResult>> ExecuteSubscriptionTasks(List<Subscrip
                             {
                                 Logger.i(nameof(StateSubscriptions), $"Channel {task.Sub.Channel.Name} failed, substituting with cache");
                                 pager = StateCache.GetChannelCachePager(task.Sub.Channel.Url);
-                                taskEx = ex;
-                                source.SetResult(new SubscriptionTaskResult(task, pager, taskEx));
+                                source.SetResult(new SubscriptionTaskResult(task, pager, null));
                                 return;
                             }
                         }