diff --git a/Corona-Warn-App/src/main/AndroidManifest.xml b/Corona-Warn-App/src/main/AndroidManifest.xml
index 45df464cdfa2ce1cad5753195594c63607dfdec7..bc150fdde9cbb787753eda68862c8d0890ed2e7a 100644
--- a/Corona-Warn-App/src/main/AndroidManifest.xml
+++ b/Corona-Warn-App/src/main/AndroidManifest.xml
@@ -65,13 +65,6 @@
             android:exported="false"
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
-
-        <service
-            android:name=".notification.ExposureNotificationIntentService"
-            android:enabled="true"
-            android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/notification/ExposureNotificationIntentService.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/notification/ExposureNotificationIntentService.kt
deleted file mode 100644
index a2f02f200998f4925595090e937f2319f4f1ecd4..0000000000000000000000000000000000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/notification/ExposureNotificationIntentService.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package de.rki.coronawarnapp.notification
-
-import android.app.IntentService
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import de.rki.coronawarnapp.R
-import de.rki.coronawarnapp.ui.main.MainActivity
-
-class ExposureNotificationIntentService : IntentService("ExposureNotificationIntentService") {
-
-    companion object {
-        private val TAG: String? = ExposureNotificationIntentService::class.simpleName
-    }
-
-    override fun onHandleIntent(p0: Intent?) {
-        Log.i(TAG, "onHandleIntent")
-        fireNotification()
-    }
-
-    private fun fireNotification() {
-        val notificationManager =
-            this.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        val takeBreakIntent = Intent(this, MainActivity::class.java)
-        val pendingIntent =
-            PendingIntent.getActivity(
-                this,
-                0,
-                takeBreakIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT
-            )
-
-        val notificationChannelId = getString(R.string.notification_channel_id)
-        val notificationId = getString(R.string.notification_id)
-
-        val notificationBuilder =
-            NotificationCompat.Builder(this, notificationChannelId).apply {
-                setContentTitle(getString(R.string.notification_headline))
-                setContentText(getString(R.string.notification_body))
-                setSmallIcon(R.drawable.ic_splash_logo)
-                priority = NotificationCompat.PRIORITY_HIGH
-                setContentIntent(pendingIntent)
-            }
-        val notification = notificationBuilder.build()
-
-        notificationManager.notify(notificationId.toInt(), notification)
-    }
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
index d786f81d378066e6feb71ebf92cb598071959bec..20a6dcf1059b37bae8ee0ed8c6daab898119adf9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
@@ -1,6 +1,5 @@
 package de.rki.coronawarnapp.ui.main
 
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -8,11 +7,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.PopupMenu
 import android.widget.Toast
+import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.fragment.app.activityViewModels
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentMainBinding
-import de.rki.coronawarnapp.notification.ExposureNotificationIntentService
 import de.rki.coronawarnapp.notification.NotificationHelper
 import de.rki.coronawarnapp.timer.TimerHelper
 import de.rki.coronawarnapp.ui.BaseFragment
@@ -152,8 +151,11 @@ class MainFragment : BaseFragment() {
                             .toString()
                     )
                     NotificationHelper.createNotificationChannel()
-                    val intent = Intent(context, ExposureNotificationIntentService::class.java)
-                    activity?.startService(intent)
+                    NotificationHelper.sendNotification(
+                        getString(R.string.notification_headline),
+                        getString(R.string.notification_body),
+                        NotificationCompat.PRIORITY_HIGH
+                    )
                     true
                 }
                 else -> super.onOptionsItemSelected(it)