diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 34729e7f8ceddea693dc9d60d6767d285b30e37a..88ef894d6ed8c69302d440b9c3bb808562badf3f 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1698,7 +1698,7 @@ class SyncHandler(object):
 
                 sync_result_builder.joined.append(room_sync)
 
-            if batch.limited:
+            if batch.limited and since_token:
                 user_id = sync_result_builder.sync_config.user.to_string()
                 logger.info(
                     "Incremental gappy sync of room %s for user %s with %d state events" % (