diff --git a/cmd/env.go b/cmd/env.go
index 17d7831e281c92e22aed1c7216c9830e7b81be0e..6ec62e100f1018e018a22bb0de76b579d1bc3d22 100644
--- a/cmd/env.go
+++ b/cmd/env.go
@@ -31,6 +31,8 @@ const (
 	flagEnvURI       = "uri"
 	flagEnvNamespace = "namespace"
 	flagEnvContext   = "context"
+
+	defaultNamespace = "default"
 )
 
 func init() {
@@ -118,6 +120,10 @@ var envAddCmd = &cobra.Command{
 			return err
 		}
 
+		if len(namespace) == 0 {
+			namespace = defaultNamespace
+		}
+
 		if len(uri) == 0 {
 			// If uri is not provided, use the provided context.
 			// If context is also not provided, use the current context.
@@ -133,7 +139,7 @@ var envAddCmd = &cobra.Command{
 			}
 
 			// If namespace is not provided, use the default namespace provided in the context.
-			if len(namespace) == 0 {
+			if !flags.Changed(flagEnvNamespace) {
 				namespace = ns
 			}
 		}
@@ -308,6 +314,11 @@ var envSetCmd = &cobra.Command{
 			return err
 		}
 
+		// If namespace flag is provided but without a value, use the default namespace.
+		if flags.Changed(flagEnvNamespace) && len(namespace) == 0 {
+			namespace = defaultNamespace
+		}
+
 		if len(context) != 0 {
 			uri, _, err = resolveContext(&context)
 			if err != nil {
@@ -356,7 +367,7 @@ func commonEnvFlags(flags *pflag.FlagSet) (uri, namespace, context string, err e
 		return "", "", "", err
 	}
 
-	if len(context) != 0 && len(uri) != 0 {
+	if flags.Changed(flagEnvContext) && flags.Changed(flagEnvURI) {
 		return "", "", "", fmt.Errorf("flags '%s' and '%s' are mutually exclusive, because '%s' has a URI. Try setting '%s', '%s' to the desired values",
 			flagEnvContext, flagEnvURI, flagEnvContext, flagEnvURI, flagEnvNamespace)
 	}
diff --git a/cmd/root.go b/cmd/root.go
index 00b9572bd0d6a8bd3dd0f3b677d4d4c9d8a31a46..7cea5a3c56bbf4b781b74a1e7dd85c4d4deb6c83 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -356,10 +356,8 @@ func overrideCluster(envName string) error {
 		clusterName := clusterURIs[env.URI]
 		log.Debugf("Overwriting --cluster flag with '%s'", clusterName)
 		overrides.Context.Cluster = clusterName
-		if len(env.Namespace) != 0 {
-			log.Debugf("Overwriting --namespace flag with '%s'", env.Namespace)
-			overrides.Context.Namespace = env.Namespace
-		}
+		log.Debugf("Overwriting --namespace flag with '%s'", env.Namespace)
+		overrides.Context.Namespace = env.Namespace
 		return nil
 	}