diff --git a/src/components/views/location/LocationPicker.tsx b/src/components/views/location/LocationPicker.tsx
index b5ed928dd35..f3f4d649860 100644
--- a/src/components/views/location/LocationPicker.tsx
+++ b/src/components/views/location/LocationPicker.tsx
@@ -188,9 +188,10 @@ class LocationPicker extends React.Component<IProps, IState> {
     private getGeoUri = (position) => {
         return (`geo:${ position.coords.latitude },` +
                 position.coords.longitude +
-                ( position.coords.altitude != null ?
+                ( position.coords.altitude !== undefined ?
                     `,${ position.coords.altitude }` : '' ) +
-                `;u=${ position.coords.accuracy }`);
+                ( position.coords.accuracy !== undefined ?
+                    `;u=${ position.coords.accuracy }` : '' ));
     };
 
     private onOk = () => {