diff --git a/cli/packages/cmd/folder.go b/cli/packages/cmd/folder.go
index b306960f4..9cb76a312 100644
--- a/cli/packages/cmd/folder.go
+++ b/cli/packages/cmd/folder.go
@@ -22,10 +22,6 @@ var folderCmd = &cobra.Command{
 var getCmd = &cobra.Command{
 	Use:   "get",
 	Short: "Get folders in a directory",
-	PersistentPreRun: func(cmd *cobra.Command, args []string) {
-		util.RequireLocalWorkspaceFile()
-		util.RequireLogin()
-	},
 	Run: func(cmd *cobra.Command, args []string) {
 
 		environmentName, _ := cmd.Flags().GetString("env")
diff --git a/cli/packages/util/folders.go b/cli/packages/util/folders.go
index 82e5451a5..18fe5c888 100644
--- a/cli/packages/util/folders.go
+++ b/cli/packages/util/folders.go
@@ -15,6 +15,8 @@ func GetAllFolders(params models.GetAllFoldersParameters) ([]models.SingleFolder
 	var foldersToReturn []models.SingleFolder
 	var folderErr error
 	if params.InfisicalToken == "" && params.UniversalAuthAccessToken == "" {
+		RequireLogin()
+		RequireLocalWorkspaceFile()
 
 		log.Debug().Msg("GetAllFolders: Trying to fetch folders using logged in details")