diff --git a/daemon/loop.go b/daemon/loop.go
index 226b534cb..483b12690 100644
--- a/daemon/loop.go
+++ b/daemon/loop.go
@@ -362,11 +362,15 @@ func (d *Daemon) doSync(logger log.Logger) (retErr error) {
 			},
 		}); err != nil {
 			logger.Log("err", err)
+			// Abort early to ensure at least once delivery of events
+			return err
 		}
 
 		for _, event := range noteEvents {
 			if err = d.LogEvent(event); err != nil {
 				logger.Log("err", err)
+				// Abort early to ensure at least once delivery of events
+				return err
 			}
 		}
 	}