diff --git a/Modules/Whoer.lua b/Modules/Whoer.lua
index b5d07a0..5143bf6 100644
--- a/Modules/Whoer.lua
+++ b/Modules/Whoer.lua
@@ -243,6 +243,7 @@ function shared.Whoer.Init()
 	local frame = CreateFrame("Frame")
 	frame:RegisterEvent("WHO_LIST_UPDATE")
 	frame:SetScript("OnEvent", function(self, event, ...)
+		queryPending = false
 		if not Heimdall_Data.config.who.enabled then return end
 		---@type WHOQuery?
 		local query = lastQuery
@@ -320,7 +321,6 @@ function shared.Whoer.Init()
 		-- Turns out WA cannot do this (
 		-- aura_env.UpdateMacro()
 		_G["FriendsFrameCloseButton"]:Click()
-		queryPending = false
 	end)
 
 	do