diff --git a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
index 87bf169f0..696d61483 100644
--- a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
+++ b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java
@@ -165,7 +165,7 @@ public class EnterJidDialog extends DialogFragment implements OnBackendConnected
                 for (final Contact contact : account.getRoster().getContacts()) {
                     if (contact.showInRoster() && (contact.getPresences().anyIdentity("gateway", null) || contact.getPresences().anySupport("jabber:iq:gateway"))) {
                         context.xmppConnectionService.fetchFromGateway(account, contact.getJid(), null, (final String prompt, String errorMessage) -> {
-                            if (prompt == null) return;
+                            if (prompt == null && !contact.getPresences().anyIdentity("gateway", null)) return;
 
                             context.runOnUiThread(() -> {
                                 gatewayListAdapter.add(contact, prompt);