diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 8370f5de0..90c46017d 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -604,7 +604,7 @@ in_state_change(to,   in,   subscribed)   -> none;
 in_state_change(to,   in,   unsubscribe)  -> {to, none};
 in_state_change(to,   in,   unsubscribed) -> {none, in};
 in_state_change(from, none, subscribe)    -> none;
-in_state_change(from, none, subscribed)   -> none;
+in_state_change(from, none, subscribed)   -> {both, none};
 in_state_change(from, none, unsubscribe)  -> {none, none};
 in_state_change(from, none, unsubscribed) -> none;
 in_state_change(from, out,  subscribe)    -> none;
@@ -633,7 +633,7 @@ out_state_change(none, both, subscribed)   -> {from, out};
 out_state_change(none, both, unsubscribe)  -> {none, in};
 out_state_change(none, both, unsubscribed) -> {none, out};
 out_state_change(to,   none, subscribe)    -> none;
-out_state_change(to,   none, subscribed)   -> none;
+out_state_change(to,   none, subscribed)   -> {both, none};
 out_state_change(to,   none, unsubscribe)  -> {none, none};
 out_state_change(to,   none, unsubscribed) -> none;
 out_state_change(to,   in,   subscribe)    -> none;
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index 8f64e5f9a..9c9f14192 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -666,7 +666,7 @@ in_state_change(to,   in,   subscribed)   -> none;
 in_state_change(to,   in,   unsubscribe)  -> {to, none};
 in_state_change(to,   in,   unsubscribed) -> {none, in};
 in_state_change(from, none, subscribe)    -> none;
-in_state_change(from, none, subscribed)   -> none;
+in_state_change(from, none, subscribed)   -> {both, none};
 in_state_change(from, none, unsubscribe)  -> {none, none};
 in_state_change(from, none, unsubscribed) -> none;
 in_state_change(from, out,  subscribe)    -> none;
@@ -695,7 +695,7 @@ out_state_change(none, both, subscribed)   -> {from, out};
 out_state_change(none, both, unsubscribe)  -> {none, in};
 out_state_change(none, both, unsubscribed) -> {none, out};
 out_state_change(to,   none, subscribe)    -> none;
-out_state_change(to,   none, subscribed)   -> none;
+out_state_change(to,   none, subscribed)   -> {both, none};
 out_state_change(to,   none, unsubscribe)  -> {none, none};
 out_state_change(to,   none, unsubscribed) -> none;
 out_state_change(to,   in,   subscribe)    -> none;