diff --git a/weaver/main.go b/weaver/main.go
index 912fc514..9d3cb909 100644
--- a/weaver/main.go
+++ b/weaver/main.go
@@ -90,11 +90,10 @@ func main() {
 	}
 
 	if nickName == "" {
-		osHostname, err := os.Hostname()
+		nickName, err = os.Hostname()
 		if err != nil {
 			log.Fatal(err)
 		}
-		nickName = osHostname
 	}
 
 	ourName, err := weave.PeerNameFromUserInput(routerName)