diff --git a/src/org/thoughtcrime/securesms/service/BootReceiver.java b/src/org/thoughtcrime/securesms/service/BootReceiver.java
index 42f0fec894..5dba90df38 100644
--- a/src/org/thoughtcrime/securesms/service/BootReceiver.java
+++ b/src/org/thoughtcrime/securesms/service/BootReceiver.java
@@ -11,9 +11,7 @@ public class BootReceiver extends BroadcastReceiver {
   public void onReceive(Context context, Intent intent) {
     if (intent != null && Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
       Intent messageRetrievalService = new Intent(context, MessageRetrievalService.class);
-
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) context.startForegroundService(messageRetrievalService);
-      else                                                context.startService(messageRetrievalService);
+      context.startService(messageRetrievalService);
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/service/PanicResponderListener.java b/src/org/thoughtcrime/securesms/service/PanicResponderListener.java
index ddbc244522..c6cefc6591 100644
--- a/src/org/thoughtcrime/securesms/service/PanicResponderListener.java
+++ b/src/org/thoughtcrime/securesms/service/PanicResponderListener.java
@@ -23,9 +23,7 @@ public class PanicResponderListener extends BroadcastReceiver {
     {
       Intent lockIntent = new Intent(context, KeyCachingService.class);
       lockIntent.setAction(KeyCachingService.CLEAR_KEY_ACTION);
-
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) context.startForegroundService(lockIntent);
-      else                                                context.startService(lockIntent);
+      context.startService(lockIntent);
     }
   }
 }
\ No newline at end of file