diff --git a/NextcloudTalk/GeoLocationRichObject.m b/NextcloudTalk/GeoLocationRichObject.m
index af64a0b12..d8df43eab 100644
--- a/NextcloudTalk/GeoLocationRichObject.m
+++ b/NextcloudTalk/GeoLocationRichObject.m
@@ -27,8 +27,19 @@ + (instancetype)geoLocationRichObjectFromMessageLocationParameter:(NCMessageLoca
     GeoLocationRichObject *richObject = [[self alloc] init];
     richObject.objectType = parameter.type;
     richObject.objectId = parameter.parameterId;
-    richObject.latitude = parameter.latitude;
-    richObject.longitude = parameter.longitude;
+
+    if ([parameter.latitude isKindOfClass:[NSNumber class]]) {
+        richObject.latitude = [(NSNumber *)parameter.latitude stringValue];
+    } else {
+        richObject.latitude = parameter.latitude;
+    }
+
+    if ([parameter.longitude isKindOfClass:[NSNumber class]]) {
+        richObject.longitude = [(NSNumber *)parameter.longitude stringValue];
+    } else {
+        richObject.longitude = parameter.longitude;
+    }
+
     richObject.name = parameter.name;
     return richObject;
 }