diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 006e1ec40..71555e9b6 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -4562,13 +4562,14 @@ void Client::Handle_OP_ClickDoor(const EQApplicationPacket *app)
 	if (within_distance) {
 		if (parse->PlayerHasQuestSub(EVENT_CLICK_DOOR)) {
 			std::vector<std::any> args = {currentdoor};
-			if (parse->EventPlayer(EVENT_CLICK_DOOR, this, std::to_string(cd->doorid), 0, &args) == 0) {
+
+			int quest_return = 0;
+			quest_return = parse->EventPlayer(EVENT_CLICK_DOOR, this, std::to_string(cd->doorid), 0, &args);
+
+			if (quest_return == 0) {
 				currentdoor->HandleClick(this, 0);
 			}
 		}
-		else {
-			currentdoor->HandleClick(this, 0);
-		}
 	}
 	else {
 		// we let this pass because client controlled doors require this to force the linked doors