diff --git a/ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt b/ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt
index ed5570adf5b0cf749d849846da13f57137723195..60c348f10498ec1d489229dc69f7b3caece7f90c 100644
--- a/ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt
+++ b/ring-android/app/src/main/java/cx/ring/services/DataTransferService.kt
@@ -37,12 +37,17 @@ class DataTransferService : Service() {
 
     @Inject
     lateinit var mNotificationService: NotificationService
+
     private lateinit var notificationManager: NotificationManagerCompat
     private var started = false
     private var serviceNotificationId = 0
     private val serviceNotifications: MutableSet<Int> = HashSet()
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        if (intent == null) {
+            stopSelfResult(startId)
+            return START_NOT_STICKY
+        }
         val notificationId = intent.getIntExtra(NotificationService.KEY_NOTIFICATION_ID, -1)
         val action = intent.action
         if (ACTION_START == action) {