diff --git a/cli/packages/cmd/folder.go b/cli/packages/cmd/folder.go
index cd50322d0..538f1e2dc 100644
--- a/cli/packages/cmd/folder.go
+++ b/cli/packages/cmd/folder.go
@@ -127,9 +127,6 @@ var createCmd = &cobra.Command{
 
 		if token != nil && (token.Type == util.SERVICE_TOKEN_IDENTIFIER || token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER) {
 			params.InfisicalToken = token.Token
-		} else {
-			util.RequireLogin()
-			util.RequireLocalWorkspaceFile()
 		}
 
 		_, err = util.CreateFolder(params)
@@ -198,9 +195,6 @@ var deleteCmd = &cobra.Command{
 
 		if token != nil && (token.Type == util.SERVICE_TOKEN_IDENTIFIER || token.Type == util.UNIVERSAL_AUTH_TOKEN_IDENTIFIER) {
 			params.InfisicalToken = token.Token
-		} else {
-			util.RequireLogin()
-			util.RequireLocalWorkspaceFile()
 		}
 
 		_, err = util.DeleteFolder(params)
diff --git a/cli/packages/util/folders.go b/cli/packages/util/folders.go
index 80d31a891..c7f6de630 100644
--- a/cli/packages/util/folders.go
+++ b/cli/packages/util/folders.go
@@ -176,6 +176,7 @@ func CreateFolder(params models.CreateFolderParameters) (models.SingleFolder, er
 	// If no token is provided, we will try to get the token from the current logged in user
 	if params.InfisicalToken == "" {
 		RequireLogin()
+		RequireLocalWorkspaceFile()
 		loggedInUserDetails, err := GetCurrentLoggedInUserDetails()
 
 		if err != nil {
@@ -221,6 +222,8 @@ func DeleteFolder(params models.DeleteFolderParameters) ([]models.SingleFolder,
 	// If no token is provided, we will try to get the token from the current logged in user
 	if params.InfisicalToken == "" {
 		RequireLogin()
+		RequireLocalWorkspaceFile()
+
 		loggedInUserDetails, err := GetCurrentLoggedInUserDetails()
 
 		if err != nil {