diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py
index 8d630c6b1a92..aa6875593603 100644
--- a/synapse/handlers/device.py
+++ b/synapse/handlers/device.py
@@ -58,7 +58,7 @@ def check_device_registered(self, user_id, device_id,
         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,