diff --git a/src/lib/onHidden.ts b/src/lib/onHidden.ts
index 873af7cc..c88d6278 100644
--- a/src/lib/onHidden.ts
+++ b/src/lib/onHidden.ts
@@ -19,28 +19,19 @@ export interface OnHiddenCallback {
   (event: Event): void;
 }
 
-let beforeUnloadFixAdded = false;
 
 export const onHidden = (cb: OnHiddenCallback, once?: boolean) => {
-  // Adding a `beforeunload` listener is needed to fix this bug:
-  // https://bugs.chromium.org/p/chromium/issues/detail?id=987409
-  if (!beforeUnloadFixAdded &&
-      // Avoid adding this in Firefox as it'll break bfcache:
-      // https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser
-      // @ts-ignore
-      typeof InstallTrigger === 'undefined') {
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    addEventListener('beforeunload', () => {});
-    beforeUnloadFixAdded = true;
-  }
-
-  const onVisibilityChange = (event: Event) => {
-    if (document.visibilityState === 'hidden') {
+  const onHiddenOrPageHide = (event: Event) => {
+    if (event.type === 'pagehide' || document.visibilityState === 'hidden') {
       cb(event);
       if (once) {
-        removeEventListener('visibilitychange', onVisibilityChange, true);
+        removeEventListener('visibilitychange', onHiddenOrPageHide, true);
+        removeEventListener('pagehide', onHiddenOrPageHide, true);
       }
     }
   }
-  addEventListener('visibilitychange', onVisibilityChange, true);
+  addEventListener('visibilitychange', onHiddenOrPageHide, true);
+  // Some browsers have buggy implementations of visibilitychange,
+  // so we use pagehide in addition, just to be safe.
+  addEventListener('pagehide', onHiddenOrPageHide, true);
 };
diff --git a/test/e2e/getTTFB-test.js b/test/e2e/getTTFB-test.js
index 53b81ed2..273b92e2 100644
--- a/test/e2e/getTTFB-test.js
+++ b/test/e2e/getTTFB-test.js
@@ -49,10 +49,13 @@ function assertValidEntry(entry) {
 
   assert.strictEqual(entry.entryType, 'navigation');
   for (const timingProp of timingProps) {
-    if (!(entry[timingProp] >= 0)) {
-      console.log(timingProp, entry[timingProp]);
+    if (browser.capabilities.browserName === 'firefox' &&
+        timingProp === 'fetchStart' &&
+        entry[timingProp] === -1) {
+      // Firefox sometimes reports the fetchStart value as -1
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=1429422
+      continue;
     }
-
     assert(entry[timingProp] >= 0);
   }
 }