diff --git a/BackgroundServices/AutoUserDownload.cs b/BackgroundServices/AutoUserDownload.cs
index 30bdc75..6e8f0c5 100644
--- a/BackgroundServices/AutoUserDownload.cs
+++ b/BackgroundServices/AutoUserDownload.cs
@@ -9,10 +9,14 @@ class AutoUserDownload : BackgroundService {
     public AutoUserDownload(ShardInstance instance) : base(instance) { }
 
     private static readonly HashSet<ulong> _failedDownloads = new();
+    private static readonly TimeSpan _singleDlTimeout = ShardManager.DeadShardThreshold / 3;
 
     public override async Task OnTick(int tickCount, CancellationToken token) {
         // Take action if a guild's cache is incomplete...
-        var incompleteCaches = ShardInstance.DiscordClient.Guilds.Where(g => !g.HasAllMembers).Select(g => g.Id).ToHashSet();
+        var incompleteCaches = ShardInstance.DiscordClient.Guilds
+            .Where(g => !g.HasAllMembers)
+            .Select(g => g.Id)
+            .ToHashSet();
         // ...and if the guild contains any user data
         IEnumerable<ulong> mustFetch;
         try {
@@ -34,28 +38,29 @@ class AutoUserDownload : BackgroundService {
         var processed = 0;
         var processStartTime = DateTimeOffset.UtcNow;
         foreach (var item in mustFetch) {
-            // May cause a disconnect in certain situations. Cancel all further attempts until the next pass if it happens.
+            // May cause a disconnect in certain situations. Make no further attempts until the next pass if it happens.
             if (ShardInstance.DiscordClient.ConnectionState != ConnectionState.Connected) break;
 
             var guild = ShardInstance.DiscordClient.GetGuild(item);
             if (guild == null) continue; // A guild disappeared...?
 
-            const int singleTimeout = 500;
-            var dl = guild.DownloadUsersAsync(); // We're already on a seperate thread, no need to use Task.Run (?)
-            dl.Wait(singleTimeout * 1000, token);
-            if (!dl.IsCompletedSuccessfully) {
-                Log($"Giving up on {guild.Id} after {singleTimeout} seconds. (Total members: {guild.MemberCount})");
-                lock (_failedDownloads) _failedDownloads.Add(guild.Id);
-            }
+            await Task.Delay(200, CancellationToken.None); // Delay a bit (reduces the possibility of hanging, somehow).
             processed++;
-
-            if (Math.Abs((DateTimeOffset.UtcNow - processStartTime).TotalMinutes) > 2) {
-                Log("Break time!");
-                // take a break (don't get killed by ShardManager for taking too long due to quantity)
+            var dl = guild.DownloadUsersAsync();
+            dl.Wait((int)_singleDlTimeout.TotalMilliseconds / 2, token);
+            if (dl.IsFaulted) {
+                Log("Exception thrown by download task: " + dl.Exception);
                 break;
+            } else if (!dl.IsCompletedSuccessfully) {
+                Log($"Hang on processing {guild.Id}. Skipping.");
+                lock (_failedDownloads) _failedDownloads.Add(guild.Id);
+                continue;
             }
+
+            // Prevent unnecessary disconnections by ShardManager if we're taking too long
+            if (DateTimeOffset.UtcNow - processStartTime > _singleDlTimeout) break;
         }
 
-        if (processed > 20) Log($"Explicit user list request processed for {processed} guild(s).");
+        if (processed > 10) Log($"Member list downloads handled for {processed} guilds.");
     }
 }
diff --git a/ShardManager.cs b/ShardManager.cs
index 420fa49..2732204 100644
--- a/ShardManager.cs
+++ b/ShardManager.cs
@@ -25,7 +25,7 @@ class ShardManager : IDisposable {
     /// Amount of time without a completed background service run before a shard instance
     /// is considered "dead" and tasked to be removed.
     /// </summary>
-    private static readonly TimeSpan DeadShardThreshold = new(0, 20, 0);
+    public static readonly TimeSpan DeadShardThreshold = new(0, 20, 0);
 
     /// <summary>
     /// A dictionary with shard IDs as its keys and shard instances as its values.
@@ -144,10 +144,10 @@ class ShardManager : IDisposable {
                     
                     shardStatuses.AppendLine();
 
-                    //if (lastRun > DeadShardThreshold) {
-                    //    shardStatuses.AppendLine($"Shard {i:00} marked for disposal.");
-                    //    deadShards.Add(i);
-                    //}
+                    if (lastRun > DeadShardThreshold) {
+                        shardStatuses.AppendLine($"Shard {i:00} marked for disposal.");
+                        deadShards.Add(i);
+                    }
                 }
                 Log(shardStatuses.ToString().TrimEnd());