diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3141c6ed..f3afe9c1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
         run: dotnet restore
       - name: Download Dalamud
         run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
           Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
       - name: Build
         run: |
diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml
index 2644974b..0968430d 100644
--- a/.github/workflows/test_release.yml
+++ b/.github/workflows/test_release.yml
@@ -20,7 +20,7 @@ jobs:
         run: dotnet restore
       - name: Download Dalamud
         run: |
-          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip
+          Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
           Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
       - name: Build
         run: |
diff --git a/Penumbra/Interop/Services/RedrawService.cs b/Penumbra/Interop/Services/RedrawService.cs
index 8e47fa0b..7a73857a 100644
--- a/Penumbra/Interop/Services/RedrawService.cs
+++ b/Penumbra/Interop/Services/RedrawService.cs
@@ -245,25 +245,25 @@ public sealed unsafe partial class RedrawService : IDisposable
             if (FindCorrectActor(idx < 0 ? ~idx : idx, out var obj))
                 _afterGPoseQueue.Add(idx < 0 ? idx : ~idx);
 
-            if (obj != null)
+            if (obj == null)
+                continue;
+
+            if (idx < 0)
             {
-                if (idx < 0)
+                if (DelayRedraw(obj))
                 {
-                    if (DelayRedraw(obj))
-                    {
-                        _queue[numKept++] = ~ObjectTableIndex(obj);
-                    }
-                    else
-                    {
-                        WriteInvisible(obj);
-                        _queue[numKept++] = ObjectTableIndex(obj);
-                    }
+                    _queue[numKept++] = ~ObjectTableIndex(obj);
                 }
                 else
                 {
-                    WriteVisible(obj);
+                    WriteInvisible(obj);
+                    _queue[numKept++] = ObjectTableIndex(obj);
                 }
             }
+            else
+            {
+                WriteVisible(obj);
+            }
         }
 
         _queue.RemoveRange(numKept, _queue.Count - numKept);