diff --git a/pkg/cmd/secret/delete/delete.go b/pkg/cmd/secret/delete/delete.go
index 87b96bee1..8f17fdf59 100644
--- a/pkg/cmd/secret/delete/delete.go
+++ b/pkg/cmd/secret/delete/delete.go
@@ -99,6 +99,14 @@ func removeRun(opts *DeleteOptions) error {
 		return err
 	}
 
+	var baseRepo ghrepo.Interface
+	if secretEntity == shared.Repository || secretEntity == shared.Environment {
+		baseRepo, err = opts.BaseRepo()
+		if err != nil {
+			return err
+		}
+	}
+
 	secretApp, err := shared.GetSecretApp(opts.Application, secretEntity)
 	if err != nil {
 		return err
@@ -108,14 +116,6 @@ func removeRun(opts *DeleteOptions) error {
 		return fmt.Errorf("%s secrets are not supported for %s", secretEntity, secretApp)
 	}
 
-	var baseRepo ghrepo.Interface
-	if secretEntity == shared.Repository || secretEntity == shared.Environment {
-		baseRepo, err = opts.BaseRepo()
-		if err != nil {
-			return err
-		}
-	}
-
 	cfg, err := opts.Config()
 	if err != nil {
 		return err
diff --git a/pkg/cmd/secret/set/set.go b/pkg/cmd/secret/set/set.go
index 87deee71c..a35c40aa3 100644
--- a/pkg/cmd/secret/set/set.go
+++ b/pkg/cmd/secret/set/set.go
@@ -178,23 +178,13 @@ func NewCmdSet(f *cmdutil.Factory, runF func(*SetOptions) error) *cobra.Command
 }
 
 func setRun(opts *SetOptions) error {
-	secrets, err := getSecretsFromOptions(opts)
-	if err != nil {
-		return err
-	}
-
-	c, err := opts.HttpClient()
-	if err != nil {
-		return fmt.Errorf("could not create http client: %w", err)
-	}
-	client := api.NewClientFromHTTP(c)
-
 	orgName := opts.OrgName
 	envName := opts.EnvName
 
 	var host string
 	var baseRepo ghrepo.Interface
 	if orgName == "" && !opts.UserSecrets {
+		var err error
 		baseRepo, err = opts.BaseRepo()
 		if err != nil {
 			return err
@@ -209,6 +199,17 @@ func setRun(opts *SetOptions) error {
 		host, _ = cfg.Authentication().DefaultHost()
 	}
 
+	secrets, err := getSecretsFromOptions(opts)
+	if err != nil {
+		return err
+	}
+
+	c, err := opts.HttpClient()
+	if err != nil {
+		return fmt.Errorf("could not create http client: %w", err)
+	}
+	client := api.NewClientFromHTTP(c)
+
 	secretEntity, err := shared.GetSecretEntity(orgName, envName, opts.UserSecrets)
 	if err != nil {
 		return err