diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index a80ea5be00..fc445cc712 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1018,6 +1018,7 @@ public class FragmentCompose extends FragmentBase {
 
         if (pgpService != null && pgpService.isBound())
             pgpService.unbindFromService();
+        pgpService = null;
 
         super.onDestroyView();
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 24b6777bc6..10393e64d8 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1294,6 +1294,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
         if (pgpService != null && pgpService.isBound())
             pgpService.unbindFromService();
+        pgpService = null;
 
         kv.clear();
         values.clear();