diff --git a/cli/server/list.go b/cli/server/list.go
index a9f03d20..838cc9d3 100644
--- a/cli/server/list.go
+++ b/cli/server/list.go
@@ -39,11 +39,7 @@ var serverListCommand = cli.Command{
 
 		tableColumns := []string{"name", "host", "user", "port"}
 		table := formatter.CreateTable(tableColumns)
-		if internal.MachineReadable {
-			defer table.JSONRender()
-		} else {
-			defer table.Render()
-		}
+
 		serverNames, err := config.ReadServerNames()
 		if err != nil {
 			logrus.Fatal(err)
@@ -84,6 +80,16 @@ var serverListCommand = cli.Command{
 			}
 		}
 
+		if internal.MachineReadable {
+			table.JSONRender()
+		} else {
+			if problemsFilter && table.NumLines() == 0 {
+				logrus.Info("all servers wired up correctly 👏")
+			} else {
+				table.Render()
+			}
+		}
+
 		return nil
 	},
 }