diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index b3ad37b6b..02f413d78 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -2153,6 +2153,10 @@ Tap the + to start adding people.";
 "location_sharing_live_timer_incoming" = "Live until %@";
 "location_sharing_live_loading" = "Loading Live location...";
 "location_sharing_live_error" = "Live location error";
+"location_sharing_live_timer_selector_title" = "Choose for how long others will see your accurate location.";
+"location_sharing_live_timer_selector_short" = "for 15 minutes";
+"location_sharing_live_timer_selector_medium" = "for 1 hour";
+"location_sharing_live_timer_selector_long" = "for 8 hours";
 
 // MARK: - MatrixKit
 
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index 98cddc8cb..d07c7c4f0 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -2807,6 +2807,22 @@ public class VectorL10n: NSObject {
   public static func locationSharingLiveTimerIncoming(_ p1: String) -> String {
     return VectorL10n.tr("Vector", "location_sharing_live_timer_incoming", p1)
   }
+  /// for 8 hours
+  public static var locationSharingLiveTimerSelectorLong: String { 
+    return VectorL10n.tr("Vector", "location_sharing_live_timer_selector_long") 
+  }
+  /// for 1 hour
+  public static var locationSharingLiveTimerSelectorMedium: String { 
+    return VectorL10n.tr("Vector", "location_sharing_live_timer_selector_medium") 
+  }
+  /// for 15 minutes
+  public static var locationSharingLiveTimerSelectorShort: String { 
+    return VectorL10n.tr("Vector", "location_sharing_live_timer_selector_short") 
+  }
+  /// Choose for how long others will see your accurate location.
+  public static var locationSharingLiveTimerSelectorTitle: String { 
+    return VectorL10n.tr("Vector", "location_sharing_live_timer_selector_title") 
+  }
   /// Location
   public static var locationSharingLiveViewerTitle: String { 
     return VectorL10n.tr("Vector", "location_sharing_live_viewer_title") 
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
index b0d9340e2..09c8d8d77 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
@@ -30,7 +30,7 @@ enum LocationSharingViewAction {
     case share
     case sharePinLocation
     case goToUserLocation
-    case shareLiveLocation
+    case shareLiveLocation(timeout: TimeInterval)
 }
 
 enum LocationSharingViewModelResult {
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
index e6a7f6226..db2186344 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
@@ -25,12 +25,6 @@ typealias LocationSharingViewModelType = StateStoreViewModel<LocationSharingView
 @available(iOS 14, *)
 class LocationSharingViewModel: LocationSharingViewModelType, LocationSharingViewModelProtocol {
     
-    // MARK: - Constants
-    
-    private enum Constants {
-        static let liveLocationSharingDefaultTimeout: TimeInterval = 300 // 5 minutes
-    }
-    
     // MARK: - Properties
     
     // MARK: Private
@@ -80,8 +74,8 @@ class LocationSharingViewModel: LocationSharingViewModelType, LocationSharingVie
             completion?(.share(latitude: pinLocation.latitude, longitude: pinLocation.longitude, coordinateType: .pin))
         case .goToUserLocation:
             state.bindings.pinLocation = nil
-        case .shareLiveLocation:
-            completion?(.shareLiveLocation(timeout: Constants.liveLocationSharingDefaultTimeout))
+        case .shareLiveLocation(let timeout):
+            completion?(.shareLiveLocation(timeout: timeout))
         }
     }
     
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
index f71c7f2df..ec7c3abe3 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
@@ -20,11 +20,21 @@ import CoreLocation
 @available(iOS 14.0, *)
 struct LocationSharingView: View {
     
+    // MARK: - Constants
+    
+    private enum Constants {
+        // Timer are in milliseconde because timestamp are in millisecond in Matrix SDK
+        static let liveLocationSharingShortTimeout: TimeInterval = 900000 // 15 minutes
+        static let liveLocationSharingMediumTimeout: TimeInterval = 3600000 // 1 hour
+        static let liveLocationSharingLongTimeout: TimeInterval = 28800000 // 8 hours
+    }
+    
     // MARK: - Properties
     
     // MARK: Private
     
     @Environment(\.theme) private var theme: ThemeSwiftUI
+    @State private var showingTimerSelector = false
     
     // MARK: Public
     
@@ -112,7 +122,7 @@ struct LocationSharingView: View {
                 // Hide for now until live location sharing is finished
                 if context.viewState.isLiveLocationSharingEnabled {
                     LocationSharingOptionButton(text: VectorL10n.locationSharingLiveShareTitle) {
-                        context.send(viewAction: .shareLiveLocation)
+                        showingTimerSelector = true
                     } buttonIcon: {
                         Image(uiImage: Asset.Images.locationLiveIcon.image)
                             .resizable()
@@ -129,6 +139,24 @@ struct LocationSharingView: View {
                 .disabled(!context.viewState.shareButtonEnabled)
             }
         }
+        .actionSheet(isPresented: $showingTimerSelector) {
+            ActionSheet(title: Text(VectorL10n.locationSharingLiveTimerSelectorTitle),
+                        buttons: [
+                            .default(Text(VectorL10n.locationSharingLiveTimerSelectorShort)) {
+                                context.send(viewAction: .shareLiveLocation(timeout: Constants.liveLocationSharingShortTimeout))
+
+                            },
+                            .default(Text(VectorL10n.locationSharingLiveTimerSelectorMedium)) {
+                                context.send(viewAction: .shareLiveLocation(timeout: Constants.liveLocationSharingMediumTimeout))
+
+                            },
+                            .default(Text(VectorL10n.locationSharingLiveTimerSelectorLong)) {
+                                context.send(viewAction: .shareLiveLocation(timeout: Constants.liveLocationSharingLongTimeout))
+
+                            },
+                            .cancel()
+                        ])
+        }
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding()
     }