diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt
index e8a6b22b7e..55ddd3aae0 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt
@@ -33,7 +33,6 @@ class LiveLocationBottomSheetController @Inject constructor(
         private val vectorDateFormatter: VectorDateFormatter,
         private val stringProvider: StringProvider,
         private val clock: Clock,
-        private val context: Context,
 ) : EpoxyController() {
 
     interface Callback {
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
index d89977d7af..31d15750a7 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
@@ -112,6 +112,7 @@ class LiveLocationMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
 
     override fun onDestroy() {
         onSymbolClickListener?.let { symbolManager?.removeClickListener(it) }
+        bottomSheetController.callback = null
         super.onDestroy()
     }