diff --git a/vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt b/vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt
index 8e917c665a..5a6e69b103 100644
--- a/vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt
+++ b/vector/src/main/java/im/vector/app/features/location/MapBoxMapExt.kt
@@ -17,6 +17,7 @@
 package im.vector.app.features.location
 
 import com.mapbox.mapboxsdk.camera.CameraPosition
+import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
 import com.mapbox.mapboxsdk.constants.MapboxConstants
 import com.mapbox.mapboxsdk.geometry.LatLng
 import com.mapbox.mapboxsdk.geometry.LatLngBounds
@@ -28,12 +29,12 @@ fun MapboxMap?.zoomToLocation(locationData: LocationData, preserveCurrentZoomLev
     } else {
         INITIAL_MAP_ZOOM_IN_PREVIEW
     }
-    this?.easeCamera {
-        CameraPosition.Builder()
-                .target(LatLng(locationData.latitude, locationData.longitude))
-                .zoom(zoomLevel)
-                .build()
-    }
+    val expectedCameraPosition = CameraPosition.Builder()
+            .target(LatLng(locationData.latitude, locationData.longitude))
+            .zoom(zoomLevel)
+            .build()
+    val cameraUpdate = CameraUpdateFactory.newCameraPosition(expectedCameraPosition)
+    this?.easeCamera(cameraUpdate)
 }
 
 fun MapboxMap?.zoomToBounds(latLngBounds: LatLngBounds) {
diff --git a/vector/src/main/res/layout/fragment_location_preview.xml b/vector/src/main/res/layout/fragment_location_preview.xml
index e70baa1581..6addcc9c73 100644
--- a/vector/src/main/res/layout/fragment_location_preview.xml
+++ b/vector/src/main/res/layout/fragment_location_preview.xml
@@ -12,7 +12,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:mapbox_renderTextureMode="true"
+        app:maplibre_renderTextureMode="true"
         app:showLocateButton="true" />
 
     <im.vector.app.features.location.MapLoadingErrorView
diff --git a/vector/src/main/res/layout/fragment_location_sharing.xml b/vector/src/main/res/layout/fragment_location_sharing.xml
index 4f0825b992..50e91741d6 100644
--- a/vector/src/main/res/layout/fragment_location_sharing.xml
+++ b/vector/src/main/res/layout/fragment_location_sharing.xml
@@ -13,7 +13,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:mapbox_renderTextureMode="true"
+        app:maplibre_renderTextureMode="true"
         app:showLocateButton="true"
         tools:background="#4F00" />