diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl
index 6d2c42c95..2dd0adbc2 100644
--- a/src/mod_avatar.erl
+++ b/src/mod_avatar.erl
@@ -219,6 +219,11 @@ get_avatar_data(JID, ItemID) ->
 				  xmpp:format_error(Why)]),
 		    {error, invalid_data}
 	    end;
+	#pubsub_item{payload = []} ->
+	    ?WARNING_MSG("Empty avatar data detected "
+			 "for ~s@~s with item id ~s",
+			 [LUser, LServer, ItemID]),
+	    {error, invalid_data};
 	{error, #stanza_error{reason = 'item-not-found'}} ->
 	    {error, notfound};
 	{error, Reason} ->