diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
index f2d6d4c13..28692f638 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
@@ -339,7 +339,8 @@ public class EditKeyFragment extends LoaderFragment implements
                         } else {
                             mSaveKeyringParcel.mRevokeUserIds.add(userId);
                             // not possible to revoke and change to primary user id
-                            if (mSaveKeyringParcel.mChangePrimaryUserId.equals(userId)) {
+                            if (mSaveKeyringParcel.mChangePrimaryUserId != null
+                                    && mSaveKeyringParcel.mChangePrimaryUserId.equals(userId)) {
                                 mSaveKeyringParcel.mChangePrimaryUserId = null;
                             }
                         }