1 files changed, 6 insertions, 2 deletions
diff --git a/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m b/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m
index e9d4791..c5ad337 100644
--- a/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m
+++ b/Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.m
@@ -211,7 +211,7 @@ static NSString *kReceiveDataMessageSelectorString = @"messaging:didReceiveMessa
 
 #pragma mark - UNNotificationCenter Swizzling
 
-- (void)swizzleUserNotificationCenterDelegate:(id)delegate {
+- (void)swizzleUserNotificationCenterDelegate:(id _Nonnull)delegate {
   if (self.currentUserNotificationCenterDelegate == delegate) {
     // Via pointer-check, compare if we have already swizzled this item.
     return;
@@ -246,7 +246,7 @@ static NSString *kReceiveDataMessageSelectorString = @"messaging:didReceiveMessa
   }
 }
 
-- (void)unswizzleUserNotificationCenterDelegate:(id)delegate {
+- (void)unswizzleUserNotificationCenterDelegate:(id _Nonnull)delegate {
   if (self.currentUserNotificationCenterDelegate != delegate) {
     // We aren't swizzling this delegate, so don't do anything.
     return;
@@ -256,6 +256,10 @@ static NSString *kReceiveDataMessageSelectorString = @"messaging:didReceiveMessa
   // Call unswizzle methods, even if the method was not implemented (it will fail gracefully).
   [self unswizzleSelector:willPresentNotificationSelector
                   inClass:[self.currentUserNotificationCenterDelegate class]];
+  SEL didReceiveNotificationResponseSelector =
+      NSSelectorFromString(kUserNotificationDidReceiveResponseSelectorString);
+  [self unswizzleSelector:didReceiveNotificationResponseSelector
+                  inClass:[self.currentUserNotificationCenterDelegate class]];
   self.currentUserNotificationCenterDelegate = nil;
   self.hasSwizzledUserNotificationDelegate = NO;
 }