Merge remote-tracking branch 'origin/develop' into joriks/opentracing_trace_sendtime github/joriks/opentracing_trace_sendtime joriks/opentracing_trace_sendtime

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py

index 41f62828bd..79a58df591 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -856,7 +856,7 @@ class DeviceStore(DeviceWorkerStore, BackgroundUpdateStore):
                     "ts": now,
                     "opentracing_context": json.dumps(context)
                     if whitelisted_homeserver(destination)
-                    else None,
+                    else "{}",
                 }
                 for destination in hosts
                 for device_id in device_ids