diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
index eb6ee9b79..803f19949 100644
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -367,7 +367,7 @@ public class RepeatControlSet extends PopupControlSet {
             result = rrule.toIcal();
         }
 
-        if (type.getSelectedItemPosition() == TYPE_COMPLETION_DATE) {
+        if (type.getSelectedItemPosition() == TYPE_COMPLETION_DATE && !TextUtils.isEmpty(result)) {
             result = result + ";FROM=COMPLETION"; //$NON-NLS-1$
         }