diff --git a/app/src/googleplay/java/org/tasks/location/GoogleGeofenceTransitionIntentService.kt b/app/src/googleplay/java/org/tasks/location/GoogleGeofenceTransitionIntentService.kt
index f2e2c6669..ba05fea6c 100644
--- a/app/src/googleplay/java/org/tasks/location/GoogleGeofenceTransitionIntentService.kt
+++ b/app/src/googleplay/java/org/tasks/location/GoogleGeofenceTransitionIntentService.kt
@@ -19,7 +19,7 @@ class GoogleGeofenceTransitionIntentService : InjectingJobIntentService() {
     @Inject lateinit var notifier: Notifier
 
     override suspend fun doWork(intent: Intent) {
-        val geofencingEvent = GeofencingEvent.fromIntent(intent)
+        val geofencingEvent = GeofencingEvent.fromIntent(intent) ?: return
         if (geofencingEvent.hasError()) {
             Timber.e("geofence error code %s", geofencingEvent.errorCode)
             return
@@ -28,7 +28,7 @@ class GoogleGeofenceTransitionIntentService : InjectingJobIntentService() {
         val triggeringGeofences = geofencingEvent.triggeringGeofences
         Timber.i("Received geofence transition: %s, %s", transitionType, triggeringGeofences)
         if (transitionType == Geofence.GEOFENCE_TRANSITION_ENTER || transitionType == Geofence.GEOFENCE_TRANSITION_EXIT) {
-            triggeringGeofences.forEach {
+            triggeringGeofences?.forEach {
                 triggerNotification(it, transitionType == Geofence.GEOFENCE_TRANSITION_ENTER)
             }
         } else {
diff --git a/deps_googleplay.txt b/deps_googleplay.txt
index 7b33b6333..bbfaab0b0 100644
--- a/deps_googleplay.txt
+++ b/deps_googleplay.txt
@@ -388,20 +388,18 @@
 +|    +--- com.google.firebase:firebase-abt:21.1.1 (*)
 +|    +--- com.google.firebase:firebase-installations-interop:17.1.0 (*)
 +|    \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-++--- com.google.android.gms:play-services-location:19.0.1
-+|    +--- com.google.android.gms:play-services-base:18.0.1
+++--- com.google.android.gms:play-services-location:21.0.1
++|    +--- com.google.android.gms:play-services-base:18.1.0
 +|    |    +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
 +|    |    +--- androidx.core:core:1.2.0 -> 1.9.0 (*)
 +|    |    +--- androidx.fragment:fragment:1.0.0 -> 1.5.7 (*)
-+|    |    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
-+|    |    \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
-+|    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
-+|    +--- com.google.android.gms:play-services-places-placereport:17.0.0
-+|    |    \--- com.google.android.gms:play-services-basement:17.0.0 -> 18.1.0 (*)
-+|    \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
++|    |    +--- com.google.android.gms:play-services-basement:18.1.0 (*)
++|    |    \--- com.google.android.gms:play-services-tasks:18.0.2 (*)
++|    +--- com.google.android.gms:play-services-basement:18.1.0 (*)
++|    \--- com.google.android.gms:play-services-tasks:18.0.2 (*)
 ++--- com.google.android.gms:play-services-maps:18.1.0
 +|    +--- androidx.fragment:fragment:1.0.0 -> 1.5.7 (*)
-+|    +--- com.google.android.gms:play-services-base:18.0.1 (*)
++|    +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
 +|    \--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
 ++--- com.android.billingclient:billing-ktx:4.1.0
 +|    +--- com.android.billingclient:billing:4.1.0
@@ -462,7 +460,7 @@
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*)
 +|    |    \--- androidx.appcompat:appcompat-resources:1.6.1 (c)
 +|    +--- androidx.loader:loader:1.0.0 (*)
-+|    +--- com.google.android.gms:play-services-base:18.0.1 (*)
++|    +--- com.google.android.gms:play-services-base:18.0.1 -> 18.1.0 (*)
 +|    +--- com.google.android.gms:play-services-basement:18.0.0 -> 18.1.0 (*)
 +|    \--- com.google.android.gms:play-services-tasks:18.0.1 -> 18.0.2 (*)
 ++--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.8.20
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 750dd95e9..deca32325 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -49,7 +49,7 @@ play-billing-ktx = "4.1.0"
 play-core-ktx = "1.8.1"
 play-core = "1.10.3"
 play-services-maps = "18.1.0"
-play-services-location = "19.0.1"
+play-services-location = "21.0.1"
 play-services-oss-licenses = "17.0.1"
 preference = "1.2.0"
 recyclerview = "1.3.0"