diff --git a/Dalamud/Game/Gui/GameGui.cs b/Dalamud/Game/Gui/GameGui.cs
index 3e3f7c5f3..de5dc411c 100644
--- a/Dalamud/Game/Gui/GameGui.cs
+++ b/Dalamud/Game/Gui/GameGui.cs
@@ -408,8 +408,16 @@ namespace Dalamud.Game.Gui
                     return IntPtr.Zero;
             }
 
-            var agent = agentModule->GetAgentByInternalID(id);
-            return (IntPtr)agent;
+            // Patch 6.1, 398 agents
+            for (var i = 0; i < 398; i++)
+            {
+                var agent = &agentModule->AgentArray[i];
+
+                if (agent->AddonId == id)
+                    return new IntPtr(agent);
+            }
+
+            return IntPtr.Zero;
         }
 
         /// <summary>