diff --git a/core/UserMessages.cpp b/core/UserMessages.cpp
index 3288c4e3..667a07b7 100644
--- a/core/UserMessages.cpp
+++ b/core/UserMessages.cpp
@@ -496,12 +496,7 @@ void UserMessages::OnMessageEnd_Pre()
 		iter++;
 	}
 
-	if (handled)
-	{
-		goto supercede;
-	}
-
-	if (intercepted)
+	if (!handled && intercepted)
 	{
 		bf_write *engine_bfw;