diff --git a/src/mod_mam_mnesia.erl b/src/mod_mam_mnesia.erl
index f94dd2e49..dff10ef96 100644
--- a/src/mod_mam_mnesia.erl
+++ b/src/mod_mam_mnesia.erl
@@ -200,8 +200,7 @@ select(_LServer, JidRequestor,
     Result.
 
 is_empty_for_user(LUser, LServer) ->
-	not lists:member({LUser, LServer},
-		mnesia:dirty_all_keys(archive_msg)).
+    mnesia:dirty_read(archive_msg, {LUser, LServer}) == [].
 
 is_empty_for_room(_LServer, LName, LHost) ->
     is_empty_for_user(LName, LHost).