diff --git a/pkg/action/list.go b/pkg/action/list.go
index 06727bd9a..4f2f28f5b 100644
--- a/pkg/action/list.go
+++ b/pkg/action/list.go
@@ -300,11 +300,6 @@ func (l *List) filterSelector(releases []*release.Release, selector labels.Selec
 
 // SetStateMask calculates the state mask based on parameters.
 func (l *List) SetStateMask() {
-	if l.All {
-		l.StateMask = ListAll
-		return
-	}
-
 	state := ListStates(0)
 	if l.Deployed {
 		state |= ListDeployed
diff --git a/pkg/cmd/list.go b/pkg/cmd/list.go
index 54becddca..161672bc7 100644
--- a/pkg/cmd/list.go
+++ b/pkg/cmd/list.go
@@ -134,7 +134,9 @@ func newListCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
 	f.IntVar(&client.Offset, "offset", 0, "next release index in the list, used to offset from start value")
 	f.StringVarP(&client.Filter, "filter", "f", "", "a regular expression (Perl compatible). Any releases that match the expression will be included in the results")
 	f.StringVarP(&client.Selector, "selector", "l", "", "Selector (label query) to filter on, supports '=', '==', and '!='.(e.g. -l key1=value1,key2=value2). Works only for secret(default) and configmap storage backends.")
+	f.BoolVarP(&client.All, "all", "a", true, "show all releases without any filter applied")
 	bindOutputFlag(cmd, &outfmt)
+	f.MarkHidden("all")
 
 	return cmd
 }