diff --git a/client/client.go b/client/client.go
index 84570f5..dd66aae 100644
--- a/client/client.go
+++ b/client/client.go
@@ -58,17 +58,11 @@ func NewClientWithContext(contextName string) (*dClient.Client, error) {
 }
 
 func GetContext(contextName string) (dCliContextStore.Metadata, error) {
-	ctxs, err := NewDefaultDockerContextStore().Store.List()
+	ctx, err := NewDefaultDockerContextStore().GetMetadata(contextName)
 	if err != nil {
 		return dCliContextStore.Metadata{}, err
 	}
-	var context dCliContextStore.Metadata
-	for _, ctx := range ctxs {
-		if ctx.Name == contextName {
-			context = ctx
-		}
-	}
-	return context, nil
+	return ctx, nil
 }
 
 func GetContextEndpoint(ctx dCliContextStore.Metadata) (string, error) {