diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 3f9ef9ba7132ed8cbd2e5dadd1f82b4dc90d2dd1..e1dc13e417b7f8212090699bbb8bfddf03619db4 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -1170,16 +1170,9 @@ public class StartConversationActivity extends XmppActivity
                     }
                 }
 
-                for (Contact contact : account.getRoster().getContacts()) {
-                    if (contact.getPresences().anyIdentity("gateway", "pstn")) {
-                        hasPstnOrSms = true;
-                        break outer;
-                    }
-                    if (contact.getPresences().anyIdentity("gateway", "sms")) {
-                        hasPstnOrSms = true;
-                        break outer;
-                    }
-                }
+                final var hasGw = account.getGateways("pstn").size() > 0 || account.getGateways("sms").size() > 0;
+                hasPstnOrSms = hasPstnOrSms || hasGw;
+                if (hasGw) break outer;
             }
 
             if (!hasPstnOrSms) {