diff --git a/internal/cli/config/set.go b/internal/cli/config/set.go
index f058b1da..eaad4bc6 100644
--- a/internal/cli/config/set.go
+++ b/internal/cli/config/set.go
@@ -54,7 +54,7 @@ If not, the config in the active profile will be set`, prop.ProfileProperties())
 					return fmt.Errorf("no profile is configured, please use `config create` to create a profile")
 				}
 
-				if propertyName == prop.ApiUrl {
+				if propertyName == prop.ApiUrl || propertyName == prop.ServerlessEndpoint {
 					_, err := prop.ValidateApiUrl(value)
 					if err != nil {
 						return err
diff --git a/internal/prop/property.go b/internal/prop/property.go
index ae5132ed..121d6875 100644
--- a/internal/prop/property.go
+++ b/internal/prop/property.go
@@ -34,7 +34,7 @@ func GlobalProperties() []string {
 }
 
 func ProfileProperties() []string {
-	return []string{PublicKey, PrivateKey, ApiUrl, TelemetryEnabled}
+	return []string{PublicKey, PrivateKey, ApiUrl, ServerlessEndpoint, TelemetryEnabled}
 }
 
 func Properties() []string {