diff --git a/command/server.go b/command/server.go
index b4b1f2ba69..74017fd716 100644
--- a/command/server.go
+++ b/command/server.go
@@ -293,8 +293,15 @@ func (c *ServerCommand) detectAdvertise(detect physical.AdvertiseDetect,
 		}
 
 		// Check if TLS is disabled
-		if val, ok := list.Config["tls_disable"]; ok && val == "1" {
-			scheme = "http"
+		if val, ok := list.Config["tls_disable"]; ok {
+			disable, err := strconv.ParseBool(val)
+			if err != nil {
+				return "", fmt.Errorf("tls_disable: %s", err)
+			}
+
+			if disable {
+				scheme = "http"
+			}
 		}
 
 		// Check for address override