diff --git a/cli/server.go b/cli/server.go
index e8d7f374..245c16c7 100644
--- a/cli/server.go
+++ b/cli/server.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"strings"
 
 	"coopcloud.tech/abra/client"
 	"coopcloud.tech/abra/config"
@@ -38,8 +39,8 @@ var serverListCommand = &cli.Command{
 			var row []string
 			for _, ctx := range contexts {
 				endpoint, err := client.GetContextEndpoint(ctx)
-				if err != nil {
-					// This most likely means its a non-docker swarm context and we can ignore
+				if err != nil && strings.Contains(err.Error(), "does not exist") {
+					// No local context found, we can continue safely
 					continue
 				}
 				if ctx.Name == serverName {