diff --git a/src/mod_ping.erl b/src/mod_ping.erl
index eee55825e..f51b929f1 100644
--- a/src/mod_ping.erl
+++ b/src/mod_ping.erl
@@ -154,7 +154,7 @@ handle_info({iq_reply, timeout, JID}, State) ->
     {noreply, State#state{timers = Timers}};
 handle_info({timeout, _TRef, {ping, JID}}, State) ->
     Host = State#state.host,
-    From = jid:remove_resource(JID),
+    From = jid:make(Host),
     IQ = #iq{from = From, to = JID, type = get, sub_els = [#ping{}]},
     ejabberd_router:route_iq(IQ, JID,
 			     gen_mod:get_module_proc(Host, ?MODULE),