diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
index 996f56a7a..e2352fa77 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java
@@ -34,6 +34,7 @@ import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.gcal.GCalHelper;
+import com.todoroo.astrid.reminders.ReminderService;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.utility.Flags;
@@ -82,6 +83,8 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
                 task.setValue(Task.HIDE_UNTIL, hideUntil);
                 Flags.set(Flags.ACTFM_REPEATED_TASK);
                 PluginServices.getTaskService().save(task);
+                ReminderService.getInstance().clearAllAlarms(task);
+                ReminderService.getInstance().scheduleAlarm(task);
                 return;
             }
 
@@ -114,6 +117,9 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver {
             GCalHelper.deleteTaskEvent(task);
             PluginServices.getTaskService().save(task);
 
+            ReminderService.getInstance().clearAllAlarms(task);
+            ReminderService.getInstance().scheduleAlarm(clone);
+
             // send a broadcast
             Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_EVENT_TASK_REPEATED);
             broadcastIntent.putExtra(AstridApiConstants.EXTRAS_TASK_ID, clone.getId());