diff --git a/cli/app/env.go b/cli/app/env.go
index 1fd06d0e0..74492edae 100644
--- a/cli/app/env.go
+++ b/cli/app/env.go
@@ -118,8 +118,12 @@ synchronize your local app environment values with what is deployed live.`),
 		}
 
 		var contextCreated bool
+		if server == "default" {
+			contextCreated = true
+		}
+
 		for _, context := range contexts {
-			if context.Name == server || server == "default" {
+			if context.Name == server {
 				contextCreated = true
 			}
 		}