1 files changed, 2 insertions, 2 deletions
diff --git a/prosody b/prosody
index 6ff7743d..0577179f 100755
--- a/prosody
+++ b/prosody
@@ -208,8 +208,8 @@ function init_global_state()
 					cl.start(listener, { 
 						ssl = conntype ~= "tcp" and global_ssl_ctx,
 						port = port,
-						interface = config.get("*", "core", option.."_interface") 
-							or cl.get(listener).default_interface 
+						interface = (option and config.get("*", "core", option.."_interface"))
+							or cl.get(listener).default_interface
 							or config.get("*", "core", "interface"),
 						type = conntype
 					});