diff --git a/syncapi/sync/requestpool.go b/syncapi/sync/requestpool.go
index c2c9616e8..b2ea105ff 100644
--- a/syncapi/sync/requestpool.go
+++ b/syncapi/sync/requestpool.go
@@ -308,6 +308,12 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
 		if syncReq.Since.IsEmpty() {
 			// Complete sync
 			syncReq.Response.NextBatch = types.StreamingToken{
+				// Get the current DeviceListPosition first, as the currentPosition
+				// might advance while processing other streams, resulting in flakey
+				// tests.
+				DeviceListPosition: rp.streams.DeviceListStreamProvider.CompleteSync(
+					syncReq.Context, syncReq,
+				),
 				PDUPosition: rp.streams.PDUStreamProvider.CompleteSync(
 					syncReq.Context, syncReq,
 				),
@@ -329,9 +335,6 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *userapi.
 				NotificationDataPosition: rp.streams.NotificationDataStreamProvider.CompleteSync(
 					syncReq.Context, syncReq,
 				),
-				DeviceListPosition: rp.streams.DeviceListStreamProvider.CompleteSync(
-					syncReq.Context, syncReq,
-				),
 				PresencePosition: rp.streams.PresenceStreamProvider.CompleteSync(
 					syncReq.Context, syncReq,
 				),