diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index 9bf154f58..5bf42a759 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -740,7 +740,7 @@ should_archive(#message{body = Body, subject = Subject,
 				#message{} = Msg ->
 				    should_archive(Msg, LServer);
 				_ ->
-				    false
+				    misc:is_mucsub_message(Pkt)
 			    end
 		    end
 	    end