diff --git a/libempathy/empathy-idle.c b/libempathy/empathy-idle.c
index e9bb1a4..f0ddbba 100644
--- a/libempathy/empathy-idle.c
+++ b/libempathy/empathy-idle.c
@@ -231,13 +231,10 @@ idle_session_status_changed_cb (DBusGProxy    *gs_proxy,
 
 		idle_ext_away_stop (idle);
 
-		if (priv->away_saved_state == TP_CONNECTION_PRESENCE_TYPE_AWAY ||
-		    priv->away_saved_state == TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY) {
-			priv->away_saved_state = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
-			new_status = NULL;
-		} else {
-			new_status = priv->status;
-		}
+		/* Empathy should not change status back to available when
+		 * the user specified a status before going idle
+		 */
+		new_status = priv->status;
 
 		/* Only try and set the presence if the away saved state is not
 		 * unset. This is an odd case because it means that the session
