diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl
index 6ca5a8b39..0682762b4 100644
--- a/src/mod_stream_mgmt.erl
+++ b/src/mod_stream_mgmt.erl
@@ -733,7 +733,9 @@ bounce_message_queue() ->
 need_to_enqueue(State, Pkt) when ?is_stanza(Pkt) ->
     {not xmpp:get_meta(Pkt, mgmt_is_resent, false), State};
 need_to_enqueue(#{mgmt_force_enqueue := true} = State, #xmlel{}) ->
-    {true, maps:remove(mgmt_is_resent, State)};
+    State1 = maps:remove(mgmt_force_enqueue, State),
+    State2 = maps:remove(mgmt_is_resent, State1),
+    {true, State2};
 need_to_enqueue(State, _) ->
     {false, State}.