diff --git a/app/src/main/java/com/bitchat/android/geohash/SystemLocationProvider.kt b/app/src/main/java/com/bitchat/android/geohash/SystemLocationProvider.kt
index ef95ec89..61c9d267 100644
--- a/app/src/main/java/com/bitchat/android/geohash/SystemLocationProvider.kt
+++ b/app/src/main/java/com/bitchat/android/geohash/SystemLocationProvider.kt
@@ -110,7 +110,11 @@ class SystemLocationProvider(private val context: Context) : LocationProvider {
                                         handler.removeCallbacks(runnable)
                                     }
                                 }
-                                locationManager.removeUpdates(this)
+                                try {
+                                    locationManager.removeUpdates(this)
+                                } catch (e: Exception) {
+                                    Log.e(TAG, "Error removing updates in callback: ${e.message}")
+                                }
                                 callback(location)
                             }
                             override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) {}