diff --git a/config/config.js.sample b/config/config.js.sample
index 8294e319..a427a548 100644
--- a/config/config.js.sample
+++ b/config/config.js.sample
@@ -9,7 +9,11 @@
  */
 
 var config = {
-	address: "localhost",
+	address: "localhost", // Address to listen on, can be:
+	                      // - "localhost", "127.0.0.1", "::1" to listen on loopback interface
+	                      // - another specific IPv4/6 to listen on a specific interface
+	                      // - "", "0.0.0.0", "::" to listen on any interface
+	                      // Default, when address config is left out, is "localhost"
 	port: 8080,
 	ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], // Set [] to allow all IP addresses
 	                                                       // or add a specific IPv4 of 192.168.1.5 :
diff --git a/js/defaults.js b/js/defaults.js
index 06ff7b62..08c4d945 100644
--- a/js/defaults.js
+++ b/js/defaults.js
@@ -8,7 +8,7 @@
  */
 
 var port = 8080;
-var address = ""; // Default to listening on all interfaces
+var address = "localhost";
 if (typeof(mmPort) !== "undefined") {
 	port = mmPort;
 }