diff --git a/cli/app/list.go b/cli/app/list.go
index 8c35ca5d..998d33fc 100644
--- a/cli/app/list.go
+++ b/cli/app/list.go
@@ -71,9 +71,13 @@ can take some time.
 		}
 		sort.Sort(config.ByServerAndType(apps))
 
+		alreadySeen := make(map[string]bool)
 		for _, app := range apps {
-			if err := ssh.EnsureHostKey(app.Server); err != nil {
-				logrus.Fatal(fmt.Sprintf(internal.SSHFailMsg, app.Server))
+			if _, ok := alreadySeen[app.Server]; !ok {
+				if err := ssh.EnsureHostKey(app.Server); err != nil {
+					logrus.Fatal(fmt.Sprintf(internal.SSHFailMsg, app.Server))
+				}
+				alreadySeen[app.Server] = true
 			}
 		}