diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 86c4032b2a..b2ff92c6d0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -182,7 +182,7 @@ public class FragmentCompose extends Fragment {
         bottom_navigation.getMenu().findItem(R.id.action_delete).setVisible(id > 0);
         bottom_navigation.getMenu().setGroupEnabled(0, false);
 
-        DB.getInstance(getContext()).identity().liveIdentities(true).observe(getActivity(), new Observer<List<EntityIdentity>>() {
+        DB.getInstance(getContext()).identity().liveIdentities(true).observe(FragmentCompose.this, new Observer<List<EntityIdentity>>() {
             @Override
             public void onChanged(@Nullable final List<EntityIdentity> identities) {
                 Collections.sort(identities, new Comparator<EntityIdentity>() {
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 0028f2f21c..8f50183cb3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -82,7 +82,7 @@ public class FragmentSetup extends Fragment {
                 btnAccount.setEnabled(false);
                 pbAccount.setVisibility(View.VISIBLE);
 
-                DB.getInstance(getContext()).account().liveFirstAccount().observe(getActivity(), new Observer<EntityAccount>() {
+                DB.getInstance(getContext()).account().liveFirstAccount().observe(FragmentSetup.this, new Observer<EntityAccount>() {
                     @Override
                     public void onChanged(@Nullable EntityAccount account) {
                         btnAccount.setEnabled(true);
@@ -116,7 +116,7 @@ public class FragmentSetup extends Fragment {
                 btnIdentity.setEnabled(false);
                 pbIdentity.setVisibility(View.VISIBLE);
 
-                DB.getInstance(getContext()).identity().liveFirstIdentity().observe(getActivity(), new Observer<EntityIdentity>() {
+                DB.getInstance(getContext()).identity().liveFirstIdentity().observe(FragmentSetup.this, new Observer<EntityIdentity>() {
                     @Override
                     public void onChanged(@Nullable EntityIdentity identity) {
                         btnIdentity.setEnabled(true);