diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
index 378af11ef..67a5044b0 100644
--- a/Riot/AppDelegate.m
+++ b/Riot/AppDelegate.m
@@ -4019,9 +4019,12 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
     {
         NSString *consentURI = notification.userInfo[kMXHTTPClientUserConsentNotGivenErrorNotificationConsentURIKey];
         if (consentURI
-            && self.gdprConsentNotGivenAlertController == nil
-            && self.gdprConsentViewController == nil)
+            && self.gdprConsentNotGivenAlertController.presentingViewController == nil
+            && self.gdprConsentViewController.presentingViewController == nil)
         {
+            self.gdprConsentNotGivenAlertController = nil;
+            self.gdprConsentViewController = nil;
+            
             UIViewController *presentingViewController = self.window.rootViewController.presentedViewController ?: self.window.rootViewController;
             
             __weak typeof(self) weakSelf = self;