diff --git a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
index 06d98af2..125d5ebb 100644
--- a/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
+++ b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java
@@ -95,7 +95,9 @@ public class CheckinService extends IntentService {
         } catch (Exception e) {
             Log.w(TAG, e);
         } finally {
-            WakefulBroadcastReceiver.completeWakefulIntent(intent);
+            if (intent != null) {
+                WakefulBroadcastReceiver.completeWakefulIntent(intent);
+            }
             schedule(this);
             stopSelf();
         }
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
index e5c6bb03..55ee3b7a 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
@@ -320,7 +320,7 @@ public class McsService extends Service implements Handler.Callback {
                 WakefulBroadcastReceiver.completeWakefulIntent(intent);
             } else if (connectIntent == null) {
                 connectIntent = intent;
-            } else {
+            } else if (intent != null) {
                 WakefulBroadcastReceiver.completeWakefulIntent(intent);
             }
         }
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/gcm/PushRegisterService.kt b/play-services-core/src/main/kotlin/org/microg/gms/gcm/PushRegisterService.kt
index 01dd1a58..02fe6f0a 100644
--- a/play-services-core/src/main/kotlin/org/microg/gms/gcm/PushRegisterService.kt
+++ b/play-services-core/src/main/kotlin/org/microg/gms/gcm/PushRegisterService.kt
@@ -112,11 +112,12 @@ class PushRegisterService : LifecycleService() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        WakefulBroadcastReceiver.completeWakefulIntent(intent)
-        Log.d(TAG, "onStartCommand: $intent")
-        lifecycleScope.launchWhenStarted {
-            if (intent == null) return@launchWhenStarted
-            handleIntent(intent)
+        if (intent != null) {
+            WakefulBroadcastReceiver.completeWakefulIntent(intent)
+            Log.d(TAG, "onStartCommand: $intent")
+            lifecycleScope.launchWhenStarted {
+                handleIntent(intent)
+            }
         }
         return super.onStartCommand(intent, flags, startId)
     }