diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/LocationAnnotation.swift b/RiotSwiftUI/Modules/Room/LocationSharing/LocationAnnotation.swift
index ad276883d..545348f0e 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationAnnotation.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationAnnotation.swift
@@ -31,6 +31,8 @@ class LocationAnnotation: NSObject, MGLAnnotation {
     }
 }
 
+class PinLocationAnnotation: LocationAnnotation {}
+
 class UserLocationAnnotation: LocationAnnotation {
     
     // MARK: - Properties
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
index 1fb1eb5fd..6295aab9c 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
@@ -49,7 +49,7 @@ class LocationSharingViewModel: LocationSharingViewModelType, LocationSharingVie
             case .user:
                 sharedLocationAnnotation = UserLocationAnnotation(avatarData: avatarData, coordinate: sharedCoordinate)
             case .pin:
-                sharedLocationAnnotation = LocationAnnotation(coordinate: sharedCoordinate)
+                sharedLocationAnnotation = PinLocationAnnotation(coordinate: sharedCoordinate)
             }
             
             annotations.append(sharedLocationAnnotation)
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift
index 10545affb..5828e5d0c 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift
@@ -118,7 +118,7 @@ extension LocationSharingMapView {
             
             if let userLocationAnnotation = annotation as? UserLocationAnnotation {
                 return LocationAnnotatonView(userLocationAnnotation: userLocationAnnotation)
-            } else if let pinLocationAnnotation = annotation as? LocationAnnotation {
+            } else if let pinLocationAnnotation = annotation as? PinLocationAnnotation {
                 return LocationAnnotatonView(pinLocationAnnotation: pinLocationAnnotation)
             } else if annotation is MGLUserLocation && locationSharingMapView.mapCenterCoordinate == nil, let currentUserAvatarData = locationSharingMapView.userAvatarData {
                 // Replace default current location annotation view with a UserLocationAnnotatonView when the map is center on user location
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotatonView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotatonView.swift
index 58de23f6a..92395b483 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotatonView.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotatonView.swift
@@ -42,7 +42,7 @@ class LocationAnnotatonView: MGLUserLocationAnnotationView {
         
     }
     
-    init(pinLocationAnnotation: LocationAnnotation) {
+    init(pinLocationAnnotation: PinLocationAnnotation) {
         // TODO: Use a reuseIdentifier
         super.init(annotation: pinLocationAnnotation, reuseIdentifier: nil)