diff --git a/flow-client/src/main/java/com/vaadin/client/ApplicationConnection.java b/flow-client/src/main/java/com/vaadin/client/ApplicationConnection.java
index 62fab73ff9b..1f3db48ce8c 100644
--- a/flow-client/src/main/java/com/vaadin/client/ApplicationConnection.java
+++ b/flow-client/src/main/java/com/vaadin/client/ApplicationConnection.java
@@ -116,16 +116,9 @@ public void start(ValueMap initialUidl) {
             registry.getMessageHandler().handleMessage(initialUidl);
         }
 
-        if (BrowserInfo.get().isFirefox()) {
-            // Sends in beforeunload in FF (don't support beacon in pagehide)
-            Browser.getWindow().addEventListener("beforeunload", e -> {
-                registry.getMessageSender().sendUnloadBeacon();
-            });
-        } else {
-            Browser.getWindow().addEventListener("pagehide", e -> {
-                registry.getMessageSender().sendUnloadBeacon();
-            });
-        }
+        Browser.getWindow().addEventListener("pagehide", e -> {
+            registry.getMessageSender().sendUnloadBeacon();
+        });
 
         Browser.getWindow().addEventListener("pageshow", e -> {
             // Currently only Safari gets here, sometimes when going back/foward