diff --git a/app/services/push_notification_pusher.rb b/app/services/push_notification_pusher.rb
index 736f3ea2bf6..0c6891d8591 100644
--- a/app/services/push_notification_pusher.rb
+++ b/app/services/push_notification_pusher.rb
@@ -157,6 +157,8 @@ class PushNotificationPusher
       end
     rescue Timeout::Error => e
       handle_generic_error(subscription, e, user, endpoint, message)
+    rescue OpenSSL::SSL::SSLError => e
+      handle_generic_error(subscription, e, user, endpoint, message)
     end
   end
 
diff --git a/lib/final_destination/http.rb b/lib/final_destination/http.rb
index ffceff99deb..4973b149a33 100644
--- a/lib/final_destination/http.rb
+++ b/lib/final_destination/http.rb
@@ -23,7 +23,7 @@ class FinalDestination::HTTP < Net::HTTP
 
       @open_timeout = remaining_time
       return super
-    rescue SystemCallError, Net::OpenTimeout => e
+    rescue OpenSSL::SSL::SSLError, SystemCallError, Net::OpenTimeout => e
       debug "[FinalDestination] Error connecting to #{ip}... #{e.message}"
       was_last_attempt = index == ips.length - 1
       raise if was_last_attempt