diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index f0c6bcc9dd83d..54bbf3869792f 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -3938,10 +3938,10 @@ def _web_push_send_notification(self, devices, private_key, public_key, payload_
                     # Avoid blocking the whole request just for a notification
                     _logger.error('An error occurred while contacting the endpoint: %s', e)
 
-            # clean up obsolete devices
-            if devices_to_unlink:
-                devices_list = list(devices_to_unlink)
-                self.env['mail.push.device'].sudo().browse(devices_list).unlink()
+        # clean up obsolete devices
+        if devices_to_unlink:
+            devices_list = list(devices_to_unlink)
+            self.env['mail.push.device'].sudo().browse(devices_list).unlink()
 
         else:
             self.env['mail.push'].sudo().create([{
diff --git a/addons/mail/tools/web_push.py b/addons/mail/tools/web_push.py
index 7325862359b4f..3255c367da569 100644
--- a/addons/mail/tools/web_push.py
+++ b/addons/mail/tools/web_push.py
@@ -168,7 +168,7 @@ def push_to_end_point(base_url, device, payload, vapid_private_key, vapid_public
         # are not received on Edge with TTL ='0'.
         # Using the TTL '0' , the microsoft endpoint returns a 400 bad request error.
         # and we are sure that the notification will be received
-        'TTL': '60',
+        'TTL': '0',
     }
 
     response = session.post(endpoint, headers=headers, data=payload, timeout=5)
diff --git a/addons/web/tooling/_eslintignore b/addons/web/tooling/_eslintignore
index 66c3982502199..a358ebf52b532 100644
--- a/addons/web/tooling/_eslintignore
+++ b/addons/web/tooling/_eslintignore
@@ -108,6 +108,23 @@ addons/html_editor/static/lib/diff2html/*.js
 !timer
 !timer/**/*
 
+# Whitelist voip modules
+!voip
+!voip/**/*
+!voip_ai
+!voip_ai/**/*
+!voip_crm
+!voip_crm/**/*
+!voip_hr_recruitment
+!voip_hr_recruitment/**/*
+!voip_onsip
+!voip_onsip/**/*
+!voip_sms
+!voip_sms/**/*
+
+# BlackList voip libs
+voip/static/lib/**/*
+
 # Whitelist industry_fsm
 !industry_fsm
 !industry_fsm/**/*