diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl
index 4fd778899..ced5424a8 100644
--- a/src/mod_stream_mgmt.erl
+++ b/src/mod_stream_mgmt.erl
@@ -664,6 +664,8 @@ inherit_session_state(#{user := U, server := S,
 			    {error, session_is_dead};
 			  exit:{normal, _} ->
 			    {error, session_has_exited};
+			  exit:{shutdown, _} ->
+			    {error, session_has_exited};
 			  exit:{killed, _} ->
 			    {error, session_was_killed};
 			  exit:{timeout, _} ->