diff --git a/src/components/views/location/LocationPicker.tsx b/src/components/views/location/LocationPicker.tsx
index dc383d67a49..b00a6678bfb 100644
--- a/src/components/views/location/LocationPicker.tsx
+++ b/src/components/views/location/LocationPicker.tsx
@@ -289,12 +289,12 @@ export function getGeoUri(position: GeolocationPosition): string {
     const lat = position.coords.latitude;
     const lon = position.coords.longitude;
     const alt = (
-        position.coords.altitude !== undefined
+        Number.isFinite(position.coords.altitude)
             ? `,${position.coords.altitude}`
             : ""
     );
     const acc = (
-        position.coords.accuracy !== undefined
+        Number.isFinite(position.coords.accuracy)
             ? `;u=${ position.coords.accuracy }`
             : ""
     );
diff --git a/test/components/views/location/LocationPicker-test.tsx b/test/components/views/location/LocationPicker-test.tsx
index 0d58612da68..e28c8cea78e 100644
--- a/test/components/views/location/LocationPicker-test.tsx
+++ b/test/components/views/location/LocationPicker-test.tsx
@@ -35,6 +35,22 @@ describe("LocationPicker", () => {
             expect(getGeoUri(pos)).toEqual("geo:43.2,12.4");
         });
 
+        it("Nulls in location are not shown in URI", () => {
+            const pos: GeolocationPosition = {
+                coords: {
+                    latitude: 43.2,
+                    longitude: 12.4,
+                    altitude: null,
+                    accuracy: null,
+                    altitudeAccuracy: null,
+                    heading: null,
+                    speed: null,
+                },
+                timestamp: 12334,
+            };
+            expect(getGeoUri(pos)).toEqual("geo:43.2,12.4");
+        });
+
         it("Renders a URI with 3 coords", () => {
             const pos: GeolocationPosition = {
                 coords: {