diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go
index 34ae00fb8..101476574 100644
--- a/syncapi/sync/requestpool.go
+++ b/syncapi/sync/requestpool.go
@@ -265,6 +265,9 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
 		syncReq.Log.WithField("currentPos", currentPos).Debugln("Responding to sync immediately")
 	}
 
+	defer rp.updateLastSeen(req, device)
+	rp.updatePresence(req.Context(), rp.db, req.FormValue("set_presence"), device.UserID)
+
 	if syncReq.Since.IsEmpty() {
 		// Complete sync
 		syncReq.Response.NextBatch = types.StreamingToken{
@@ -338,9 +341,6 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
 		}
 	}
 
-	rp.updateLastSeen(req, device)
-	rp.updatePresence(req.Context(), rp.db, req.FormValue("set_presence"), device.UserID)
-
 	return util.JSONResponse{
 		Code: http.StatusOK,
 		JSON: syncReq.Response,