diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index ff94cd2f9..dec73cfab 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -752,6 +752,7 @@ public final class ActFmSyncService {
                 if(manual) {
                     Long[] localIds = ids.toArray(new Long[ids.size()]);
                     taskService.deleteWhere(Criterion.and(TaskCriteria.activeAndVisible(),
+                            Task.REMOTE_ID.isNotNull(),
                             Criterion.not(Task.ID.in(localIds))));
                 }
             }
@@ -810,6 +811,7 @@ public final class ActFmSyncService {
                     taskService.deleteWhere(Criterion.and(
                             TagService.memberOfTagData(tagData.getValue(TagData.REMOTE_ID)),
                             TaskCriteria.activeAndVisible(),
+                            Task.REMOTE_ID.isNotNull(),
                             Criterion.not(Task.ID.in(localIds))));
                 }
             }
@@ -1063,8 +1065,6 @@ public final class ActFmSyncService {
 
     }
 
-
-
     /** Call sync method */
     private void invokeFetchList(final String model, final boolean manual, final SyncExceptionHandler handler,
             final ListItemProcessor<?> processor, final Runnable done, final String lastSyncKey,