diff --git a/deps/rabbit/src/amqqueue.erl b/deps/rabbit/src/amqqueue.erl
index 38c9065c657d..8bf5a2345f19 100644
--- a/deps/rabbit/src/amqqueue.erl
+++ b/deps/rabbit/src/amqqueue.erl
@@ -464,7 +464,7 @@ set_policy_version(#amqqueue{} = Queue, PV) ->
 % type_state (new in v2)
 
 -spec get_type_state(amqqueue()) -> map().
-get_type_state(#amqqueue{type_state = TState}) ->
+get_type_state(#amqqueue{type_state = TState}) when is_map(TState) ->
     TState;
 get_type_state(_) ->
     #{}.