diff --git a/MatrixSDK/JSONModels/Event/Content/MXEventContentLocation.m b/MatrixSDK/JSONModels/Event/Content/MXEventContentLocation.m
index 7723c1ceb5..14951a68e2 100644
--- a/MatrixSDK/JSONModels/Event/Content/MXEventContentLocation.m
+++ b/MatrixSDK/JSONModels/Event/Content/MXEventContentLocation.m
@@ -111,7 +111,8 @@ + (instancetype)modelFromJSON:(NSDictionary *)JSONDictionary
         }
         
         finalLocationDictionary = @{
-            kMXMessageGeoURIKey: geoURIString
+            // The parsing logic inside `[MXLocation modelFromJSON:]` expects the geo URI to be at "uri" and not at "geo_uri"
+            kMXMessageContentKeyExtensibleLocationURI: geoURIString
         };
     }
     else
diff --git a/changelog.d/pr-1801.bugfix b/changelog.d/pr-1801.bugfix
new file mode 100644
index 0000000000..7cbdd8309c
--- /dev/null
+++ b/changelog.d/pr-1801.bugfix
@@ -0,0 +1 @@
+Fix parsing logic for legacy location events
\ No newline at end of file