Support clients supplying older tokens, fix short poll test

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/types.py b/synapse/types.py

index 8d3a8d88cc..84631d177d 100644
--- a/synapse/types.py
+++ b/synapse/types.py
@@ -112,7 +112,7 @@ class StreamToken(
     def from_string(cls, string):
         try:
             keys = string.split(cls._SEPARATOR)
-            if len(keys) == len(cls._fields) - 1:
+            while len(keys) < len(cls._fields):
                 # i.e. old token from before receipt_key
                 keys.append("0")
             return cls(*keys)