diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go
index bb5ccf5cfa..1616565b71 100644
--- a/cli/cmd/cluster.go
+++ b/cli/cmd/cluster.go
@@ -475,22 +475,11 @@ var _clusterDownCmd = &cobra.Command{
 			errors.PrintError(err)
 			fmt.Println()
 		} else {
-			state := clusterstate.GetClusterState(stacks)
-			if err := clusterstate.AssertClusterState(stacks, state, clusterstate.StateClusterDoesntExist); err != nil {
-				awsClient.DeleteQueuesWithPrefix(clusterconfig.SQSNamePrefix(accessConfig.ClusterName))
-				awsClient.DeletePolicy(clusterconfig.DefaultPolicyARN(accountID, accessConfig.ClusterName, accessConfig.Region))
-				if !_flagClusterDownKeepAWSResources {
-					volumes, err := listPVCVolumesForCluster(awsClient, accessConfig.ClusterName)
-					if err == nil {
-						for _, volume := range volumes {
-							awsClient.DeleteVolume(*volume.VolumeId)
-						}
-					}
-				}
+			if clusterstate.GetClusterState(stacks) == clusterstate.StateClusterDoesntExist {
+				fmt.Println("cluster doesn't exist ✓")
+			} else {
 				fmt.Println("✓")
 				clusterExists = true
-			} else {
-				fmt.Println("already deleted ✓")
 			}
 		}