diff --git a/docs/turn-howto.rst b/docs/turn-howto.rst
index 2cb0c4170d94a7397dc480b07a13e15050adec7c..82b59538c80630091f9c1cc7c5c403fa8b5b5eff 100644
--- a/docs/turn-howto.rst
+++ b/docs/turn-howto.rst
@@ -62,8 +62,8 @@ synapse Setup
 
 Your home server configuration file needs the following extra keys:
 
- 1. "turn_uris": This needs to be a comma-separated
-    list of public-facing URIs for your TURN server to be given out 
+ 1. "turn_uris": This needs to be a yaml list
+    of public-facing URIs for your TURN server to be given out 
     to your clients. Add separate entries for each transport your
     TURN server supports.
 
diff --git a/synapse/config/voip.py b/synapse/config/voip.py
index c5131d9bcd40a127698a70e238d33701971681b7..3a51664f4640056f0fb8d41326ba27cd3b797f67 100644
--- a/synapse/config/voip.py
+++ b/synapse/config/voip.py
@@ -19,7 +19,7 @@ class VoipConfig(Config):
 
     def __init__(self, args):
         super(VoipConfig, self).__init__(args)
-        self.turn_uris = args.turn_uris.split(",") if args.turn_uris else None
+        self.turn_uris = args.turn_uris
         self.turn_shared_secret = args.turn_shared_secret
         self.turn_user_lifetime = args.turn_user_lifetime