diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
index 84a8e0534..f06d80562 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
@@ -63,7 +63,7 @@ struct LocationSharingViewState: BindableState {
     var showsUserLocation: Bool = false
     
     /// Used to hide live location sharing features until is finished
-    var isLiveLocationSharingEnabled: Bool
+    var isLiveLocationSharingEnabled: Bool = false
     
     var shareButtonVisible: Bool {
         return self.displayExistingLocation == false
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
index ac02e04e3..bccd95391 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
@@ -35,7 +35,7 @@ class LocationSharingViewModel: LocationSharingViewModelType, LocationSharingVie
     
     // MARK: - Setup
     
-    init(mapStyleURL: URL, avatarData: AvatarInputProtocol, location: CLLocationCoordinate2D? = nil, isLiveLocationSharingEnabled: Bool) {
+    init(mapStyleURL: URL, avatarData: AvatarInputProtocol, location: CLLocationCoordinate2D? = nil, isLiveLocationSharingEnabled: Bool = false) {
         
         var userAnnotation: UserLocationAnnotation?
         var annotations: [UserLocationAnnotation] = []
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift b/RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift
index d5040db2f..469d47004 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift
@@ -33,7 +33,6 @@ class LocationSharingUITests: XCTestCase {
         goToScreenWithIdentifier(MockLocationSharingScreenState.shareUserLocation.title)
         
         XCTAssertTrue(app.buttons["Cancel"].exists)
-        XCTAssertTrue(app.buttons["Share"].exists)
         XCTAssertTrue(app.otherElements["Map"].exists)
     }
     
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
index dc355b83e..0e2c67b55 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
@@ -32,21 +32,21 @@ struct LocationSharingView: View {
     
     var body: some View {
         NavigationView {
-            VStack(spacing: 0) {
-                ZStack(alignment: .bottom) {
-                    LocationSharingMapView(tileServerMapURL: context.viewState.mapStyleURL,
-                                           annotations: context.viewState.annotations,
-                                           highlightedAnnotation: context.viewState.highlightedAnnotation,
-                                           userAvatarData: context.viewState.userAvatarData,
-                                           showsUserLocation: context.viewState.showsUserLocation,
-                                           userLocation: $context.userLocation,
-                                           errorSubject: context.viewState.errorSubject)
-                        .ignoresSafeArea()
+            ZStack(alignment: .bottom) {
+                LocationSharingMapView(tileServerMapURL: context.viewState.mapStyleURL,
+                                       annotations: context.viewState.annotations,
+                                       highlightedAnnotation: context.viewState.highlightedAnnotation,
+                                       userAvatarData: context.viewState.userAvatarData,
+                                       showsUserLocation: context.viewState.showsUserLocation,
+                                       userLocation: $context.userLocation,
+                                       errorSubject: context.viewState.errorSubject)
+                VStack(spacing: 0) {
                     MapCreditsView()
-                }
-                if context.viewState.shareButtonVisible {
-                    buttonsView
-                        .cornerRadius(10)
+                    if context.viewState.shareButtonVisible {
+                        buttonsView
+                            .background(theme.colors.background)
+                            .clipShape(RoundedCornerShape(radius: 8, corners: [.topLeft, .topRight]))
+                    }
                 }
             }
             .toolbar {