diff --git a/src/features/home/pages/ThematicHome.native.test.tsx b/src/features/home/pages/ThematicHome.native.test.tsx
index 05cec41f015..2a92d362dfd 100644
--- a/src/features/home/pages/ThematicHome.native.test.tsx
+++ b/src/features/home/pages/ThematicHome.native.test.tsx
@@ -293,6 +293,7 @@ describe('ThematicHome', () => {
       ${true}           | ${'deeplink'}       | ${LocationMode.EVERYWHERE}   | ${LocationMode.AROUND_ME}
       ${true}           | ${'deeplink'}       | ${LocationMode.AROUND_PLACE} | ${LocationMode.AROUND_ME}
       ${true}           | ${'category_block'} | ${LocationMode.AROUND_ME}    | ${LocationMode.AROUND_ME}
+      ${true}           | ${'category_block'} | ${LocationMode.EVERYWHERE}   | ${LocationMode.AROUND_ME}
       ${false}          | ${'deeplink'}       | ${LocationMode.EVERYWHERE}   | ${LocationMode.EVERYWHERE}
       ${false}          | ${'category_block'} | ${LocationMode.EVERYWHERE}   | ${LocationMode.EVERYWHERE}
       ${false}          | ${'deeplink'}       | ${LocationMode.AROUND_PLACE} | ${LocationMode.AROUND_PLACE}
diff --git a/src/features/home/pages/ThematicHome.tsx b/src/features/home/pages/ThematicHome.tsx
index 17ca53221bd..95cf416a7bc 100644
--- a/src/features/home/pages/ThematicHome.tsx
+++ b/src/features/home/pages/ThematicHome.tsx
@@ -148,7 +148,7 @@ export const ThematicHome: FunctionComponent = () => {
       case selectedLocationMode === LocationMode.AROUND_PLACE:
         setSelectedLocationMode(LocationMode.AROUND_PLACE)
         break
-      case selectedLocationMode === LocationMode.AROUND_ME:
+      case selectedLocationMode === LocationMode.AROUND_ME || hasGeolocPosition:
         setSelectedLocationMode(LocationMode.AROUND_ME)
         break
       default: