diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
index 4714028fe..f28aa4ce0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
@@ -45,6 +45,7 @@ class TaskReceiver : BroadcastReceiver() {
 
     private fun createNotification(context: Context, taskTitle: String) {
         val intent = Intent(context, MainActivity::class.java)
+
         intent.putExtra("notificationIdentifier", "task_reminder")
         val pendingIntent = PendingIntent.getActivity(context, System.currentTimeMillis().toInt(), intent, 0)
         val soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index 7cb308d32..50ee07b02 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -750,6 +750,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
     }
 
     private fun displayTutorialStep(step: TutorialStep, text: String, canBeDeferred: Boolean) {
+        removeActiveTutorialView()
         val view = TutorialView(this, step, this)
         this.activeTutorialView = view
         view.setTutorialText(text)
@@ -765,6 +766,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
     }
 
     private fun displayTutorialStep(step: TutorialStep, texts: List<String>, canBeDeferred: Boolean) {
+        removeActiveTutorialView()
         val view = TutorialView(this, step, this)
         this.activeTutorialView = view
         view.setTutorialTexts(texts)