diff --git a/cli/command/registry/logout.go b/cli/command/registry/logout.go
index 16218f67d9a7..436376fdf313 100644
--- a/cli/command/registry/logout.go
+++ b/cli/command/registry/logout.go
@@ -46,7 +46,9 @@ func runLogout(ctx context.Context, dockerCLI command.Cli, serverAddress string)
 
 	var isDefaultRegistry bool
 
-	if serverAddress == "" {
+	if serverAddress != "" && serverAddress != registry.DefaultNamespace {
+		isDefaultRegistry = false
+	} else {
 		serverAddress = registry.IndexServer
 		isDefaultRegistry = true
 	}