diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index c9b95a755..115c61302 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -740,7 +740,7 @@ out_subscription(User, Server, JID, subscribed) ->
     Owner = exmpp_jid:make(User, Server, ""),
     {U, S, R} = jlib:short_prepd_jid(JID),
     Rs = case R of
-	[] -> user_resources(U, S);
+	undefined -> user_resources(U, S);
 	_ -> [R]
     end,
     presence(Server, {presence, U, S, Rs, Owner});
diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl
index 1b2f47745..4e1b42317 100644
--- a/src/mod_pubsub/mod_pubsub_odbc.erl
+++ b/src/mod_pubsub/mod_pubsub_odbc.erl
@@ -550,7 +550,7 @@ out_subscription(User, Server, JID, subscribed) ->
     Owner = exmpp_jid:make(User, Server, ""),
     {U, S, R} = jlib:short_prepd_jid(JID),
     Rs = case R of
-	[] -> user_resources(U, S);
+	undefined -> user_resources(U, S);
 	_ -> [R]
     end,
     presence(Server, {presence, U, S, Rs, Owner});
diff --git a/src/mod_pubsub/pubsub_odbc.patch b/src/mod_pubsub/pubsub_odbc.patch
index a7954aada..7d2bb90e4 100644
--- a/src/mod_pubsub/pubsub_odbc.patch
+++ b/src/mod_pubsub/pubsub_odbc.patch
@@ -1,5 +1,5 @@
---- mod_pubsub.erl	2010-06-10 14:25:01.000000000 +0200
-+++ mod_pubsub_odbc.erl	2010-06-10 14:25:09.000000000 +0200
+--- mod_pubsub.erl	2010-06-10 18:25:27.000000000 +0200
++++ mod_pubsub_odbc.erl	2010-06-10 18:25:34.000000000 +0200
 @@ -42,7 +42,7 @@
  %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see
  %%% XEP-0060 section 12.18.