diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl
index 8805c5da4..eeacbd930 100644
--- a/src/ejabberd_router.erl
+++ b/src/ejabberd_router.erl
@@ -380,7 +380,7 @@ do_route(Pkt, #route{local_hint = LocalHint,
 	{apply, Module, Function} when node(Pid) == node() ->
 	    Module:Function(Pkt);
 	_ ->
-	    Pid ! {route, Pkt}
+	    ejabberd_cluster:send(Pid, {route, Pkt})
     end;
 do_route(_Pkt, _Route) ->
     ok.
diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index d442bd5cb..07d71bfdc 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -380,7 +380,7 @@ handle_offline_items_view(JID, Items) ->
 				    NewEl = set_offline_tag(El, Node),
 				    case ejabberd_sm:get_session_pid(U, S, R) of
 					Pid when is_pid(Pid) ->
-					    Pid ! {route, NewEl};
+					    ejabberd_c2s:route(Pid, {route, NewEl});
 					none ->
 					    ok
 				    end,