diff --git a/mod_mam_mnesia/src/mod_mam_mnesia.erl b/mod_mam_mnesia/src/mod_mam_mnesia.erl
index 698323a..299c345 100644
--- a/mod_mam_mnesia/src/mod_mam_mnesia.erl
+++ b/mod_mam_mnesia/src/mod_mam_mnesia.erl
@@ -352,7 +352,7 @@ message_type(#xmlel{attrs = Attrs}) ->
 
 has_non_empty_body(Message) ->
     xml:get_subtag_cdata(Message, <<"body">>) =/= <<"">> orelse
-    xml:get_subtag_cdata(Message, <<"axolotl_message">>) =/= <<"">>.
+    xml:get_subtag(Message, <<"axolotl_message">>) =/= false.
 
 -spec has_no_storage_hint(xmlel()) -> boolean().