Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_auth

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py

index 8d630c6b1a..aa68755936 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -58,7 +58,7 @@ class DeviceHandler(BaseHandler):
         attempts = 0
         while attempts < 5:
             try:
-                device_id = stringutils.random_string_with_symbols(16)
+                device_id = stringutils.random_string(10).upper()
                 yield self.store.store_device(
                     user_id=user_id,
                     device_id=device_id,