diff --git a/prog/weaveproxy/main.go b/prog/weaveproxy/main.go
index 6b86128f..bc19d365 100644
--- a/prog/weaveproxy/main.go
+++ b/prog/weaveproxy/main.go
@@ -19,7 +19,10 @@ func main() {
 	var (
 		debug       bool
 		justVersion bool
-		c           proxy.Config
+		c           = proxy.Config{
+			DockerAddr: defaultDockerAddr,
+			ListenAddr: defaultListenAddr,
+		}
 	)
 
 	c.Version = version
@@ -45,14 +48,6 @@ func main() {
 		InitDefaultLogging(true)
 	}
 
-	if c.DockerAddr == "" {
-		c.DockerAddr = defaultDockerAddr
-	}
-
-	if c.ListenAddr == "" {
-		c.ListenAddr = defaultListenAddr
-	}
-
 	p, err := proxy.NewProxy(c)
 	if err != nil {
 		Error.Fatalf("Could not start proxy: %s", err)