diff --git a/src/mod_push.erl b/src/mod_push.erl
index 7979125c5..8a6901efb 100644
--- a/src/mod_push.erl
+++ b/src/mod_push.erl
@@ -682,7 +682,7 @@ drop_online_sessions(LUser, LServer, Clients) ->
 
 -spec make_summary(binary(), xmpp_element() | xmlel() | none, direction())
       -> xdata() | undefined.
-make_summary(Host, #message{from = From} = Pkt, recv) ->
+make_summary(Host, #message{from = From0} = Pkt, recv) ->
     case {mod_push_opt:include_sender(Host),
 	  mod_push_opt:include_body(Host)} of
 	{false, false} ->
@@ -702,6 +702,7 @@ make_summary(Host, #message{from = From} = Pkt, recv) ->
 			      end,
 		    Fields2 = case IncludeSender of
 				  true ->
+				      From = jid:remove_resource(From0),
 				      [{'last-message-sender', From} | Fields1];
 				  false ->
 				      Fields1