diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
index 3882c6e41..e742f4d84 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -111,17 +111,9 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
         if (account == null || connectionService == null) {
             throw new IllegalArgumentException("account and service cannot be null");
         }
-        // this way for adding bouncycastle to android
-        //Security.removeProvider("BC");
-
-        // Confirm that positioning this provider at the end works for your needs!
-        Security.addProvider(new BouncyCastleProvider());
-        if (Security.getProvider("BCPQC") == null) {
-            Security.addProvider(new BouncyCastlePQCProvider());
+        if (Security.getProvider("BC") == null) {
+            Security.addProvider(new BouncyCastleProvider());
         }
-        //if (Security.getProvider("BC") == null) {
-        //    Security.addProvider(new BouncyCastleProvider());
-        //}
         this.mXmppConnectionService = connectionService;
         this.account = account;
         this.axolotlStore = new SQLiteAxolotlStore(this.account, this.mXmppConnectionService);
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
index 42ddd3fbb..790e33bd6 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
@@ -36,7 +36,7 @@ public class XmppAxolotlMessage {
 
     private static final String KEYTYPE = "AES";
     private static final String CIPHERMODE = "AES/GCM/NoPadding";
-    private static final String PROVIDER = "BCPQC";
+    private static final String PROVIDER = "BC";
     private final List<XmppAxolotlSession.AxolotlKey> keys;
     private final Jid from;
     private final int sourceDeviceId;
diff --git a/src/main/java/eu/siacs/conversations/worker/ExportBackupWorker.java b/src/main/java/eu/siacs/conversations/worker/ExportBackupWorker.java
index 42776ea10..d05ccc7ac 100644
--- a/src/main/java/eu/siacs/conversations/worker/ExportBackupWorker.java
+++ b/src/main/java/eu/siacs/conversations/worker/ExportBackupWorker.java
@@ -70,7 +70,7 @@ public class ExportBackupWorker extends Worker {
 
     public static final String KEYTYPE = "AES";
     public static final String CIPHERMODE = "AES/GCM/NoPadding";
-    public static final String PROVIDER = "BCPQC";
+    public static final String PROVIDER = "BC";
 
     public static final String MIME_TYPE = "application/vnd.conversations.backup";