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 30a6dcb35..7f9e03e3d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -118,7 +118,7 @@ public final class ActFmSyncService {
             public void onModelUpdated(final Task model) {
                 if(Flags.checkAndClear(Flags.ACTFM_SUPPRESS_SYNC))
                     return;
-                if (actFmPreferenceService.isOngoing())
+                if (actFmPreferenceService.isOngoing() && model.getTransitory("task-edit-save") == null)
                     return;
                 final ContentValues setValues = model.getSetValues();
                 if(setValues == null || !checkForToken() || setValues.containsKey(RemoteModel.REMOTE_ID_PROPERTY_NAME))
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index ea9e61fd0..8e4a61bf1 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -656,6 +656,7 @@ public final class TaskEditActivity extends Activity {
         boolean cancelFinish = !onPause && peopleControlSet != null &&
             !peopleControlSet.saveSharingSettings(processedToast);
 
+        model.putTransitory("task-edit-save", true); //$NON-NLS-1$
         taskService.save(model);
 
         if (!onPause && !cancelFinish) {