diff --git a/src/csync_propagate.c b/src/csync_propagate.c
index 0790ccddd..bdbf7d57f 100644
--- a/src/csync_propagate.c
+++ b/src/csync_propagate.c
@@ -528,9 +528,10 @@ out:
   if (rc != 0) {
     st->instruction = CSYNC_INSTRUCTION_ERROR;
     if (turi != NULL) {
-      /* FIXME: Think again if unlink makes sense. It does not for ownCloud */
-      /* csync_vio_unlink(ctx, turi); *
-       */
+      if (_push_to_tmp_first(ctx)) {
+        /* Remove the tmp file in error case. */
+        csync_vio_unlink(ctx, turi);
+      }
     }
   }