diff --git a/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
index 23ec76884..9abb9c28e 100644
--- a/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
+++ b/src/github.com/matrix-org/dendrite/syncapi/storage/syncserver.go
@@ -173,15 +173,15 @@ func (d *SyncServerDatabase) CompleteSync(userID string, numRecentEventsPerRoom
 			// There may be some overlap where events in stateEvents are already in recentEvents, so filter
 			// them out so we don't include them twice in the /sync response. They should be in recentEvents
 			// only, so clients get to the correct state once they have rolled forward.
-			for i := 0; i < len(recentEvents); i++ {
-				if recentEvents[i].StateKey() == nil {
+			for _, recentEv := range recentEvents {
+				if recentEv.StateKey() == nil {
 					continue // not a state event
 				}
 				// TODO: This is a linear scan over all the current state events in this room. This will
 				//       be slow for big rooms. We should instead sort the state events by event ID  (ORDER BY)
 				//       then do a binary search to find matching events, similar to what roomserver does.
 				for j := 0; j < len(stateEvents); j++ {
-					if stateEvents[j].EventID() == recentEvents[i].EventID() {
+					if stateEvents[j].EventID() == recentEv.EventID() {
 						// overwrite the element to remove with the last element then pop the last element.
 						// This is orders of magnitude faster than re-slicing, but doesn't preserve ordering
 						// (we don't care about the order of stateEvents)