diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
index ec0bca0be..2cf522089 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderController.java
@@ -65,7 +65,7 @@ public class ReminderController
                                long reminderTime)
     {
         notificationTray.show(habit, timestamp, reminderTime);
-        reminderScheduler.scheduleAll();
+        reminderScheduler.scheduleHabitAtReminder(habit);
     }
 
     public void onSnooze(@NonNull Habit habit, final Context context)
diff --git a/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java b/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
index bb6338bd3..26f26a13c 100644
--- a/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
+++ b/uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
@@ -82,7 +82,7 @@ public class ReminderControllerTest extends BaseAndroidJVMTest
         Habit habit = mock(Habit.class);
         controller.onShowReminder(habit, Timestamp.ZERO.plus(100), 456);
         verify(notificationTray).show(habit, Timestamp.ZERO.plus(100), 456);
-        verify(reminderScheduler).scheduleAll();
+        verify(reminderScheduler).scheduleHabitAtReminder(habit);
     }
 
     @Test