diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
index 4d48896817..c48f900f3f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
@@ -139,7 +139,12 @@ public class IdentityKeyUtil {
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
       KeyStoreHelper.SealedData encryptedSecret = KeyStoreHelper.seal(value.getBytes());
-      preferencesEditor.putString(key+ENCRYPTED_SUFFIX, encryptedSecret.serialize());
+      boolean isEncryptedSuffix = key.endsWith(ENCRYPTED_SUFFIX);
+      if (isEncryptedSuffix) {
+        preferencesEditor.putString(key, encryptedSecret.serialize());
+      } else {
+        preferencesEditor.putString(key+ENCRYPTED_SUFFIX, encryptedSecret.serialize());
+      }
     } else {
       preferencesEditor.putString(key, value);
     }