diff --git a/app/src/main/java/app/fedilab/android/helper/ECDH.java b/app/src/main/java/app/fedilab/android/helper/ECDH.java
index c0ac1cfdf..3f00ad8fe 100644
--- a/app/src/main/java/app/fedilab/android/helper/ECDH.java
+++ b/app/src/main/java/app/fedilab/android/helper/ECDH.java
@@ -157,24 +157,24 @@ public class ECDH {
         return base64Encode(getPair(context, account).getPublic().getEncoded());
     }
 
-    void saveServerKey(Context context, String strPeerPublic) {
+    void saveServerKey(Context context, Account account, String strPeerPublic) {
         SharedPreferences.Editor prefsEditor = PreferenceManager
                 .getDefaultSharedPreferences(context).edit();
 
-        prefsEditor.putString(peer_public, strPeerPublic);
+        prefsEditor.putString(peer_public + account.getId() + account.getInstance(), strPeerPublic);
         prefsEditor.commit();
     }
 
-    PublicKey getServerKey(Context context) throws Exception {
+    PublicKey getServerKey(Context context, Account account) throws Exception {
         return readPublicKey(
                 PreferenceManager.getDefaultSharedPreferences(context)
-                        .getString(peer_public, "")
+                        .getString(peer_public + account.getId() + account.getInstance(), "")
         );
     }
 
     byte[] getSecret(Context context, Account account) {
         try {
-            return generateSecret(getPair(context, account).getPrivate(), getServerKey(context));
+            return generateSecret(getPair(context, account).getPrivate(), getServerKey(context, account));
         } catch (Exception e) {
             e.printStackTrace();
             return null;
diff --git a/app/src/main/java/app/fedilab/android/helper/PushNotifications.java b/app/src/main/java/app/fedilab/android/helper/PushNotifications.java
index affc7d364..85577e508 100644
--- a/app/src/main/java/app/fedilab/android/helper/PushNotifications.java
+++ b/app/src/main/java/app/fedilab/android/helper/PushNotifications.java
@@ -21,7 +21,7 @@ public class PushNotifications {
 
         //register
 
-        ecdh.saveServerKey(context, server_key);
+        ecdh.saveServerKey(context, account, server_key);
     }
 
     public static void getDistributors(Context context) {