diff --git a/gajim/roster_window.py b/gajim/roster_window.py
index 82c1bec7f79aafcc0a864f2854173ebc3bd7eac2..abb6e99773e033f6153b05f23a7a73a65b5895cd 100644
--- a/gajim/roster_window.py
+++ b/gajim/roster_window.py
@@ -3375,11 +3375,9 @@ def on_status_combobox_changed(self, widget):
                 'contacts.'))
             self.update_status_combobox()
             return
+
         status = model[active][2]
-        # status "desync'ed" or not
-        statuses_unified = helpers.statuses_unified()
-        if (active == 7 and statuses_unified) or (active == 9 and \
-        not statuses_unified):
+        if status == 'status':
             # 'Change status message' selected:
             # do not change show, just show change status dialog
             status = model[self.previous_status_combobox_active][2]