diff --git a/src/com/android/email/activity/setup/AccountServerBaseFragment.java b/src/com/android/email/activity/setup/AccountServerBaseFragment.java
index 3da71cfd7..7664779ef 100644
--- a/src/com/android/email/activity/setup/AccountServerBaseFragment.java
+++ b/src/com/android/email/activity/setup/AccountServerBaseFragment.java
@@ -158,6 +158,14 @@ public abstract class AccountServerBaseFragment extends Fragment
         mContext = activity;
     }
 
+    @Override
+    public void onDetach() {
+        super.onDetach();
+
+        // Ensure that we don't have any callbacks at this point.
+        mCallback = EmptyCallback.INSTANCE;
+    }
+
     @Override
     public void onPause() {
         // Hide the soft keyboard if we lose focus