diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index c34b1583c..e6437199b 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -3367,14 +3367,23 @@ send_items(Host, Node, NodeId, Type, LJID, Number) ->
 ).
 
 dispatch_items(_From, _To, _Node, _Stanza = undefined) -> ok;
-dispatch_items(From, {ToU, ToS, ToR} = To, Node, Stanza) ->
-    case ejabberd_sm:get_session_pid(ToU, ToS, ToR) of
-      C2SPid when is_pid(C2SPid) ->
-	  ejabberd_c2s:send_filtered(C2SPid,
-				     {pep_message, <<Node/binary, "+notify">>},
-				     service_jid(From), jlib:make_jid(To),
-				     Stanza)
-      _ -> ok
+dispatch_items({FromU, FromS, FromR} = From, {ToU, ToS, ToR} = To, Node,
+	       Stanza) ->
+    C2SPid = case ejabberd_sm:get_session_pid(ToU, ToS, ToR) of
+	       ToPid when is_pid(ToPid) -> ToPid;
+	       _ ->
+		   R = user_resource(FromU, FromS, FromR),
+		   case ejabberd_sm:get_session_pid(FromU, FromS, R) of
+		     FromPid when is_pid(FromPid) -> FromPid;
+		     _ -> undefined
+		   end
+	     end,
+    if C2SPid == undefined -> ok;
+       true ->
+	   ejabberd_c2s:send_filtered(C2SPid,
+				      {pep_message, <<Node/binary, "+notify">>},
+				      service_jid(From), jlib:make_jid(To),
+				      Stanza)
     end;
 dispatch_items(From, To, _Node, Stanza) ->
     ejabberd_router:route(service_jid(From), jlib:make_jid(To), Stanza).
diff --git a/src/mod_pubsub_odbc.erl b/src/mod_pubsub_odbc.erl
index 8edd1250b..e2b357f03 100644
--- a/src/mod_pubsub_odbc.erl
+++ b/src/mod_pubsub_odbc.erl
@@ -3052,14 +3052,23 @@ send_items(Host, Node, NodeId, Type, LJID, Number) ->
 ).
 
 dispatch_items(_From, _To, _Node, _Stanza = undefined) -> ok;
-dispatch_items(From, {ToU, ToS, ToR} = To, Node, Stanza) ->
-    case ejabberd_sm:get_session_pid(ToU, ToS, ToR) of
-      C2SPid when is_pid(C2SPid) ->
-	  ejabberd_c2s:send_filtered(C2SPid,
-				     {pep_message, <<Node/binary, "+notify">>},
-				     service_jid(From), jlib:make_jid(To),
-				     Stanza)
-      _ -> ok
+dispatch_items({FromU, FromS, FromR} = From, {ToU, ToS, ToR} = To, Node,
+	       Stanza) ->
+    C2SPid = case ejabberd_sm:get_session_pid(ToU, ToS, ToR) of
+	       ToPid when is_pid(ToPid) -> ToPid;
+	       _ ->
+		   R = user_resource(FromU, FromS, FromR),
+		   case ejabberd_sm:get_session_pid(FromU, FromS, R) of
+		     FromPid when is_pid(FromPid) -> FromPid;
+		     _ -> undefined
+		   end
+	     end,
+    if C2SPid == undefined -> ok;
+       true ->
+	   ejabberd_c2s:send_filtered(C2SPid,
+				      {pep_message, <<Node/binary, "+notify">>},
+				      service_jid(From), jlib:make_jid(To),
+				      Stanza)
     end;
 dispatch_items(From, To, _Node, Stanza) ->
     ejabberd_router:route(service_jid(From), jlib:make_jid(To), Stanza).