diff --git a/ChangeLog b/ChangeLog
index 3fd58a8f7..bea8772d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
 
 	* src/mod_pubsub/pubsub.hrl: remove unused pubsub_presence record
 
+	* src/mod_pubsub/node_default.erl: remove pubsub_state record when
+	unsubscribing node without affiliation (EJAB-776)
+
 2008-12-08  Mickael Remond  <mremond@process-one.net>
 
 	* src/ejabberd_c2s.erl: Enforce client stanza from attribute
diff --git a/src/mod_pubsub/node_default.erl b/src/mod_pubsub/node_default.erl
index dca41d4ac..ba8e2edd7 100644
--- a/src/mod_pubsub/node_default.erl
+++ b/src/mod_pubsub/node_default.erl
@@ -378,6 +378,10 @@ unsubscribe_node(Host, Node, Sender, Subscriber, _SubId) ->
 		%% Requesting entity is prohibited from unsubscribing entity
 		not Authorized ->
 		    {error, ?ERR_FORBIDDEN};
+		%% Was just subscriber, remove the record
+		State#pubsub_state.affiliation == none ->
+		    mnesia:delete({pubsub_state, State#pubsub_state.stateid}),
+		    {result, default};
 		true ->
 		    set_state(State#pubsub_state{subscription = none}),
 		    {result, default}