diff --git a/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java b/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java index 75063296f19..a1e9bb68234 100644 --- a/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java +++ b/firebase-common/src/main/java/com/google/firebase/FirebaseApp.java @@ -676,7 +676,11 @@ public void onReceive(Context context, Intent intent) { } public void unregister() { - applicationContext.unregisterReceiver(this); + try { + applicationContext.unregisterReceiver(this); + } catch (IllegalArgumentException ignore) { + // The receiver isn't registered. + } } }