diff --git a/aws/data_source_aws_ecs_cluster.go b/aws/data_source_aws_ecs_cluster.go
index b6dbc63f4c93..308bdb9a95ae 100644
--- a/aws/data_source_aws_ecs_cluster.go
+++ b/aws/data_source_aws_ecs_cluster.go
@@ -61,21 +61,21 @@ func dataSourceAwsEcsClusterRead(d *schema.ResourceData, meta interface{}) error
 		return err
 	}
 
-	for _, cluster := range desc.Clusters {
-		if aws.StringValue(cluster.ClusterName) != d.Get("cluster_name").(string) {
-			continue
-		}
-		d.SetId(aws.StringValue(cluster.ClusterArn))
-		d.Set("arn", cluster.ClusterArn)
-		d.Set("status", cluster.Status)
-		d.Set("pending_tasks_count", cluster.PendingTasksCount)
-		d.Set("running_tasks_count", cluster.RunningTasksCount)
-		d.Set("registered_container_instances_count", cluster.RegisteredContainerInstancesCount)
+	if len(desc.Clusters) == 0 {
+		return fmt.Errorf("no matches found for name: %s", d.Get("cluster_name").(string))
 	}
 
-	if d.Id() == "" {
-		return fmt.Errorf("cluster with name %q not found", d.Get("cluster_name").(string))
+	if len(desc.Clusters) > 1 {
+		return fmt.Errorf("multiple matches found for name: %s", d.Get("cluster_name").(string))
 	}
 
+	cluster := desc.Clusters[0]
+	d.SetId(aws.StringValue(cluster.ClusterArn))
+	d.Set("arn", cluster.ClusterArn)
+	d.Set("status", cluster.Status)
+	d.Set("pending_tasks_count", cluster.PendingTasksCount)
+	d.Set("running_tasks_count", cluster.RunningTasksCount)
+	d.Set("registered_container_instances_count", cluster.RegisteredContainerInstancesCount)
+
 	return nil
 }