diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 219c463f4bfac7f6aba98f28e4e65d837e9fa90f..8417b20221c923aa0bf71bd0c84535bb73d9d11b 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -2,12 +2,8 @@ package eu.siacs.conversations;
 
 import android.graphics.Bitmap;
 import android.net.Uri;
-import eu.siacs.conversations.crypto.XmppDomainVerifier;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.chatstate.ChatState;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import java.util.Locale;
 
 public final class Config {
@@ -179,22 +175,6 @@ public final class Config {
         "_NULL_", "_EXPORT_", "_anon_", "_RC4_", "_DES_", "_MD5",
     };
 
-    public static class OMEMO_EXCEPTIONS {
-        // if the own account matches one of the following domains OMEMO won’t be turned on
-        // automatically
-        public static final List<String> ACCOUNT_DOMAINS = Collections.singletonList("s.ms");
-
-        // if the contacts domain matches one of the following domains OMEMO won’t be turned on
-        // automatically
-        // can be used for well known, widely used gateways
-        private static final List<String> CONTACT_DOMAINS =
-                Arrays.asList("cheogram.com", "*.covid.monal.im");
-
-        public static boolean matchesContactDomain(final String domain) {
-            return XmppDomainVerifier.matchDomain(domain, CONTACT_DOMAINS);
-        }
-    }
-
     private Config() {}
 
     public static final class Map {
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 0fec5bcb3d64ffee9cb0250a13635e0c84b6bf27..1f192d57a22f1bc1693a47f1946cfc2d6049fd44 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -165,12 +165,6 @@ public class Conversation extends AbstractEntity
         if (conversation.getContact().isOwnServer()) {
             return false;
         }
-        final String contact = conversation.getJid().getDomain().toEscapedString();
-        final String account = conversation.getAccount().getServer();
-        if (Config.OMEMO_EXCEPTIONS.matchesContactDomain(contact)
-                || Config.OMEMO_EXCEPTIONS.ACCOUNT_DOMAINS.contains(account)) {
-            return false;
-        }
         return conversation.isSingleOrPrivateAndNonAnonymous()
                 || conversation.getBooleanAttribute(
                         ATTRIBUTE_FORMERLY_PRIVATE_NON_ANONYMOUS, false);