diff --git a/AirCasting.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/AirCasting.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 6af2cd056..9c1fb1977 100644
--- a/AirCasting.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/AirCasting.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,13 +1,175 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "abseil",
+        "repositoryURL": "https://github.com/google/abseil-cpp-binary.git",
+        "state": {
+          "branch": null,
+          "revision": "194a6706acbd25e4ef639bcaddea16e8758a3e27",
+          "version": "1.2024011602.0"
+        }
+      },
+      {
+        "package": "AppCheck",
+        "repositoryURL": "https://github.com/google/app-check.git",
+        "state": {
+          "branch": null,
+          "revision": "3b62f154d00019ae29a71e9738800bb6f18b236d",
+          "version": "10.19.2"
+        }
+      },
       {
         "package": "Charts",
-        "repositoryURL": "https://github.com/danielgindi/Charts",
+        "repositoryURL": "https://github.com/jterhorst/Charts",
+        "state": {
+          "branch": "bugfix/3.6.1_xcode14_compilation",
+          "revision": "0cc20181d2e709032495091d8879ca4a95587e3d",
+          "version": null
+        }
+      },
+      {
+        "package": "DeviceKit",
+        "repositoryURL": "https://github.com/devicekit/DeviceKit",
+        "state": {
+          "branch": null,
+          "revision": "d37e70cb2646666dcf276d7d3d4a9760a41ff8a6",
+          "version": "4.9.0"
+        }
+      },
+      {
+        "package": "Firebase",
+        "repositoryURL": "https://github.com/firebase/firebase-ios-sdk",
+        "state": {
+          "branch": null,
+          "revision": "e57841b296d04370ea23580f908881b0ccab17b9",
+          "version": "10.28.1"
+        }
+      },
+      {
+        "package": "GoogleAppMeasurement",
+        "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git",
+        "state": {
+          "branch": null,
+          "revision": "fe727587518729046fc1465625b9afd80b5ab361",
+          "version": "10.28.0"
+        }
+      },
+      {
+        "package": "GoogleDataTransport",
+        "repositoryURL": "https://github.com/google/GoogleDataTransport.git",
+        "state": {
+          "branch": null,
+          "revision": "a637d318ae7ae246b02d7305121275bc75ed5565",
+          "version": "9.4.0"
+        }
+      },
+      {
+        "package": "GoogleUtilities",
+        "repositoryURL": "https://github.com/google/GoogleUtilities.git",
+        "state": {
+          "branch": null,
+          "revision": "57a1d307f42df690fdef2637f3e5b776da02aad6",
+          "version": "7.13.3"
+        }
+      },
+      {
+        "package": "gRPC",
+        "repositoryURL": "https://github.com/google/grpc-binary.git",
+        "state": {
+          "branch": null,
+          "revision": "e9fad491d0673bdda7063a0341fb6b47a30c5359",
+          "version": "1.62.2"
+        }
+      },
+      {
+        "package": "GTMSessionFetcher",
+        "repositoryURL": "https://github.com/google/gtm-session-fetcher.git",
+        "state": {
+          "branch": null,
+          "revision": "a2ab612cb980066ee56d90d60d8462992c07f24b",
+          "version": "3.5.0"
+        }
+      },
+      {
+        "package": "Gzip",
+        "repositoryURL": "https://github.com/1024jp/GzipSwift",
+        "state": {
+          "branch": null,
+          "revision": "731037f6cc2be2ec01562f6597c1d0aa3fe6fd05",
+          "version": "6.0.1"
+        }
+      },
+      {
+        "package": "InteropForGoogle",
+        "repositoryURL": "https://github.com/google/interop-ios-for-google-sdks.git",
+        "state": {
+          "branch": null,
+          "revision": "2d12673670417654f08f5f90fdd62926dc3a2648",
+          "version": "100.0.0"
+        }
+      },
+      {
+        "package": "leveldb",
+        "repositoryURL": "https://github.com/firebase/leveldb.git",
         "state": {
           "branch": null,
-          "revision": "66546404a6739173b8e436ab6bc1f2897cd08594",
-          "version": "3.6.0"
+          "revision": "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+          "version": "1.22.5"
+        }
+      },
+      {
+        "package": "nanopb",
+        "repositoryURL": "https://github.com/firebase/nanopb.git",
+        "state": {
+          "branch": null,
+          "revision": "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
+          "version": "2.30910.0"
+        }
+      },
+      {
+        "package": "Promises",
+        "repositoryURL": "https://github.com/google/promises.git",
+        "state": {
+          "branch": null,
+          "revision": "540318ecedd63d883069ae7f1ed811a2df00b6ac",
+          "version": "2.4.0"
+        }
+      },
+      {
+        "package": "Resolver",
+        "repositoryURL": "https://github.com/hmlongco/Resolver",
+        "state": {
+          "branch": null,
+          "revision": "97de0b0320036607564af4a60025b48f8d041221",
+          "version": "1.5.0"
+        }
+      },
+      {
+        "package": "swift-algorithms",
+        "repositoryURL": "https://github.com/apple/swift-algorithms.git",
+        "state": {
+          "branch": null,
+          "revision": "87e50f483c54e6efd60e885f7f5aa946cee68023",
+          "version": "1.2.1"
+        }
+      },
+      {
+        "package": "swift-numerics",
+        "repositoryURL": "https://github.com/apple/swift-numerics.git",
+        "state": {
+          "branch": null,
+          "revision": "bbadd4b853a33fd78c4ae977d17bb2af15eb3f2a",
+          "version": "1.1.0"
+        }
+      },
+      {
+        "package": "SwiftProtobuf",
+        "repositoryURL": "https://github.com/apple/swift-protobuf.git",
+        "state": {
+          "branch": null,
+          "revision": "2547102afd04fe49f1b286090f13ebce07284980",
+          "version": "1.31.1"
         }
       },
       {
@@ -18,6 +180,15 @@
           "revision": "d4cbe1889c7b650b4753d1ec681e9967588995f7",
           "version": "1.1.1"
         }
+      },
+      {
+        "package": "ZipArchive",
+        "repositoryURL": "https://github.com/ZipArchive/ZipArchive",
+        "state": {
+          "branch": null,
+          "revision": "825ff12a74a94c54e737e279604c27e6740e8a2c",
+          "version": "2.4.2"
+        }
       }
     ]
   },
diff --git a/AirCasting/CreateSessionViews/ChooseCustomLocationView.swift b/AirCasting/CreateSessionViews/ChooseCustomLocationView.swift
index bad3ad105..b28f75586 100644
--- a/AirCasting/CreateSessionViews/ChooseCustomLocationView.swift
+++ b/AirCasting/CreateSessionViews/ChooseCustomLocationView.swift
@@ -14,6 +14,7 @@ struct ChooseCustomLocationView: View {
     @Binding var creatingSessionFlowContinues: Bool
     @StateObject private var locationTracker = BindableLocationTracker()
     var sessionName: String
+    @State private var locationChangedProgramatically: Bool = false
     @Injected private var AppLocationTracker: LocationTracker
     
     @EnvironmentObject private var sessionContext: CreateSessionContext
@@ -38,6 +39,8 @@ struct ChooseCustomLocationView: View {
         .background(confirmCreatingSessionLink)
         .sheet(isPresented: $isLocationPopupPresented, onDismiss: {
             guard let newLocation = location else { return }
+            
+            locationChangedProgramatically = true
             locationTracker.ovverridenLocation = newLocation
         }, content: {
             PlacePicker(service: ChooseLocationPickerService(address: $locationName,
@@ -58,8 +61,11 @@ struct ChooseCustomLocationView: View {
                  locationTracker: locationTracker,
                  stickHardToTheUser: true)
         .indicateMapLocationChange { newLocation in
-            location = .init(latitude: newLocation.coordinate.latitude,
-                             longitude: newLocation.coordinate.longitude)
+            if !locationChangedProgramatically {
+                locationChangedProgramatically = false
+                location = .init(latitude: newLocation.coordinate.latitude,
+                                 longitude: newLocation.coordinate.longitude)
+            }
         }
         .onMyLocationButtonTapped {
             locationTracker.ovverridenLocation = nil