diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index f9ab71650..fecb35341 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -705,8 +705,7 @@ remove_user(User, Server) ->
 					case node_action(Host, PType,
 							 get_state,
 							 [Nidx, jid:tolower(Entity)]) of
-					    {result, State} ->
-						ItemIds = State#pubsub_state.items,
+					    {result, #pubsub_state{items = ItemIds}} ->
 						node_action(Host, PType,
 							    remove_extra_items,
 							    [Nidx, 0, ItemIds]),
@@ -3822,6 +3821,8 @@ node_call(Host, Type, Function, Args) ->
 	    case apply(Module, Function, Args) of
 		{result, Result} ->
 		    {result, Result};
+		#pubsub_state{} = Result ->
+		    {result, Result};
 		{error, #stanza_error{}} = Err ->
 		    Err;
 		{error, _} ->