diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java
index 1d287ca338..1400185afa 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.java
@@ -31,6 +31,7 @@ public class DummyService extends Service {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         super.onStartCommand(intent, flags, startId);
+        startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, PersistentNotificationPlugin.getPlugin().updateNotification());
         return START_STICKY;
     }
 
@@ -45,11 +46,9 @@ public class DummyService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
+        // TODO: I guess this was moved here in order to adhere to the 5 seconds rule to call "startForeground" after a Service was called as Foreground service?
+        // As onCreate() is not called every time a service is started, copied to onStartCommand().
         Notification notification = PersistentNotificationPlugin.getPlugin().updateNotification();
-        if (notification == null) {
-            log.debug("notification==null");
-            notification = new Notification();
-        }
         startForeground(PersistentNotificationPlugin.ONGOING_NOTIFICATION_ID, notification);
         MainApp.bus().register(this);
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java
index 8898f798dc..c302f71b38 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.java
@@ -17,6 +17,8 @@ import androidx.core.app.TaskStackBuilder;
 
 import com.squareup.otto.Subscribe;
 
+import javax.annotation.Nonnull;
+
 import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.MainActivity;
 import info.nightscout.androidaps.MainApp;
@@ -79,7 +81,8 @@ public class PersistentNotificationPlugin extends PluginBase {
                 .neverVisible(true)
                 .pluginName(R.string.ongoingnotificaction)
                 .enableByDefault(true)
-                .alwaysEnabled(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                .alwaysEnabled(true)
+                .showInList(false)
                 .description(R.string.description_persistent_notification)
         );
         this.ctx = ctx;
@@ -87,8 +90,8 @@ public class PersistentNotificationPlugin extends PluginBase {
 
     @Override
     protected void onStart() {
+        createNotificationChannel(); // make sure channels exist before triggering updates through the bus
         MainApp.bus().register(this);
-        createNotificationChannel();
         triggerNotificationUpdate();
         super.onStart();
     }
@@ -112,18 +115,14 @@ public class PersistentNotificationPlugin extends PluginBase {
     }
 
     private void triggerNotificationUpdate() {
-        if (updateNotification() != null)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-                MainApp.instance().startForegroundService(new Intent(MainApp.instance(), DummyService.class));
-            else
-                MainApp.instance().startService(new Intent(MainApp.instance(), DummyService.class));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+            MainApp.instance().startForegroundService(new Intent(MainApp.instance(), DummyService.class));
+        else
+            MainApp.instance().startService(new Intent(MainApp.instance(), DummyService.class));
     }
 
+    @Nonnull
     Notification updateNotification() {
-        if (!isEnabled(PluginType.GENERAL)) {
-            return null;
-        }
-
         String line1 = null;
         String line2 = null;
         String line3 = null;