diff --git a/third_party/blink/renderer/modules/geolocation/geolocation.cc b/third_party/blink/renderer/modules/geolocation/geolocation.cc
index 854280a0b439cc..2e77b50548c6c8 100644
--- a/third_party/blink/renderer/modules/geolocation/geolocation.cc
+++ b/third_party/blink/renderer/modules/geolocation/geolocation.cc
@@ -512,7 +512,13 @@ void Geolocation::OnPositionUpdated(
 }
 
 void Geolocation::PageVisibilityChanged() {
-  UpdateGeolocationConnection(nullptr);
+  for (auto& notifier : *one_shots_)
+    UpdateGeolocationConnection(notifier);
+
+  HeapVector<Member<GeoNotifier>> watchers;
+  watchers_->CopyNotifiersToVector(watchers);
+  for (auto& notifier : watchers)
+    UpdateGeolocationConnection(notifier);
 }
 
 bool Geolocation::HasPendingActivity() const {
diff --git a/third_party/blink/web_tests/wpt_internal/geolocation-api/getCurrentPosition_visibility.https.html b/third_party/blink/web_tests/wpt_internal/geolocation-api/getCurrentPosition_visibility.https.html
new file mode 100644
index 00000000000000..42decf89702e0e
--- /dev/null
+++ b/third_party/blink/web_tests/wpt_internal/geolocation-api/getCurrentPosition_visibility.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE HTML>
+<meta charset='utf-8'>
+<title>Geolocation Test: getCurrentPosition returns after visibilityState changes</title>
+<link rel='help' href='http://www.w3.org/TR/geolocation-API/#get-current-position'>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<p>Clear all Geolocation permissions before running this test. If prompted for permission, please allow.</p>
+<div id='log'></div>
+
+<script>
+setup(test_driver.set_permission({name: 'geolocation'}, 'granted', true));
+
+promise_test(async t => {
+  assert_equals(document.visibilityState, "visible");
+
+  const gcp = new Promise(resolve => navigator.geolocation.getCurrentPosition(
+    p => resolve(pos),
+    e => resolve(e),
+    {timeout: 100, maximumAge: 0}))
+  await gcp;
+
+  const changed = new Promise(resolve => document.addEventListener("visibilitychange", resolve, {once:true}));
+  testRunner.setMainWindowHidden(true);
+  await changed;
+  assert_equals(document.visibilityState, "hidden");
+
+  const gcp2 = new Promise(resolve => navigator.geolocation.getCurrentPosition(
+    p => resolve(pos),
+    e => resolve(e),
+    {timeout: 100, maximumAge: 0}));
+
+  const changed2 = new Promise(resolve => document.addEventListener("visibilitychange", resolve, {once:true}));
+  testRunner.setMainWindowHidden(false);
+  await changed2;
+  assert_equals(document.visibilityState, "visible");
+
+  await gcp2;
+}, "getCurrentPosition returns after visibilityState changes");
+</script>
