diff --git a/aws/resource_aws_eks_cluster.go b/aws/resource_aws_eks_cluster.go
index 8328ac25b95c..abaf6b74bb2e 100644
--- a/aws/resource_aws_eks_cluster.go
+++ b/aws/resource_aws_eks_cluster.go
@@ -1,8 +1,14 @@
 package aws
 
 import (
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/base64"
 	"fmt"
 	"log"
+	"net/http"
+	"net/url"
+	"path"
 	"strings"
 	"time"
 
@@ -161,6 +167,11 @@ func resourceAwsEksCluster() *schema.Resource {
 				},
 				Set: schema.HashString,
 			},
+			"wait_for_endpoint": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
 		},
 	}
 }
@@ -224,7 +235,7 @@ func resourceAwsEksClusterCreate(d *schema.ResourceData, meta interface{}) error
 		Pending: []string{eks.ClusterStatusCreating},
 		Target:  []string{eks.ClusterStatusActive},
 		Timeout: d.Timeout(schema.TimeoutCreate),
-		Refresh: refreshEksClusterStatus(conn, name),
+		Refresh: refreshEksClusterStatus(conn, name, d.Get("wait_for_endpoint").(bool)),
 	}
 	_, err = stateConf.WaitForState()
 	if err != nil {
@@ -539,7 +550,7 @@ func flattenEksEnabledLogTypes(logging *eks.Logging) *schema.Set {
 	return flattenStringSet(enabledLogTypes)
 }
 
-func refreshEksClusterStatus(conn *eks.EKS, clusterName string) resource.StateRefreshFunc {
+func refreshEksClusterStatus(conn *eks.EKS, clusterName string, shouldWaitForEndpoint bool) resource.StateRefreshFunc {
 	return func() (interface{}, string, error) {
 		output, err := conn.DescribeCluster(&eks.DescribeClusterInput{
 			Name: aws.String(clusterName),
@@ -551,6 +562,12 @@ func refreshEksClusterStatus(conn *eks.EKS, clusterName string) resource.StateRe
 		if cluster == nil {
 			return cluster, "", fmt.Errorf("EKS Cluster (%s) missing", clusterName)
 		}
+		if shouldWaitForEndpoint && aws.StringValue(cluster.Status) == eks.ClusterStatusActive {
+			if !isEndpointHealthzOK(aws.StringValue(cluster.Endpoint), cluster.CertificateAuthority) {
+				log.Printf("[DEBUG] EKS Endpoint is not ready")
+				return cluster, eks.ClusterStatusCreating, nil
+			}
+		}
 		return cluster, aws.StringValue(cluster.Status), nil
 	}
 }
@@ -584,7 +601,7 @@ func waitForDeleteEksCluster(conn *eks.EKS, clusterName string, timeout time.Dur
 		},
 		Target:  []string{""},
 		Timeout: timeout,
-		Refresh: refreshEksClusterStatus(conn, clusterName),
+		Refresh: refreshEksClusterStatus(conn, clusterName, false),
 	}
 	cluster, err := stateConf.WaitForState()
 	if err != nil {
@@ -633,3 +650,42 @@ func waitForUpdateEksCluster(conn *eks.EKS, clusterName, updateID string, timeou
 
 	return fmt.Errorf("EKS Cluster (%s) update (%s) status (%s) not successful: Errors:\n%s", clusterName, updateID, aws.StringValue(update.Status), strings.Join(detailedErrors, "\n"))
 }
+
+func isEndpointHealthzOK(endpoint string, certificate *eks.Certificate) bool {
+	if endpoint == "" || certificate == nil {
+		return false
+	}
+
+	u, _ := url.Parse(endpoint)
+	u.Path = path.Join(u.Path, "healthz")
+	healthzEndpoint := u.String()
+	caCert, _ := base64.StdEncoding.DecodeString(aws.StringValue(certificate.Data))
+	log.Printf("[DEBUG] Getting EKS Endpoint %s", healthzEndpoint)
+
+	caCertPool := x509.NewCertPool()
+	caCertPool.AppendCertsFromPEM(caCert)
+
+	tr := &http.Transport{
+		TLSClientConfig: &tls.Config{
+			RootCAs:            caCertPool,
+			InsecureSkipVerify: false,
+		},
+	}
+	client := &http.Client{
+		Timeout:   2 * time.Second,
+		Transport: tr,
+	}
+	resp, err := client.Get(healthzEndpoint)
+
+	if err != nil {
+		log.Printf("[WARN] Error wile getting EKS Endpoint healthz: %s", err)
+		return false
+	}
+
+	if resp.StatusCode >= 200 && resp.StatusCode <= 299 {
+		log.Printf("[DEBUG] Getted EKS Endpoint %s successfully", healthzEndpoint)
+		return true
+	}
+
+	return false
+}
diff --git a/website/docs/r/eks_cluster.html.markdown b/website/docs/r/eks_cluster.html.markdown
index 1b63e1e248c6..d816c7f41728 100644
--- a/website/docs/r/eks_cluster.html.markdown
+++ b/website/docs/r/eks_cluster.html.markdown
@@ -45,7 +45,7 @@ output "kubeconfig-certificate-authority-data" {
 ```hcl
 resource "aws_iam_role" "example" {
   name = "eks-cluster-example"
-  
+
   assume_role_policy = <<POLICY
 {
   "Version": "2012-10-17",
@@ -155,6 +155,7 @@ The following arguments are supported:
 * `enabled_cluster_log_types` - (Optional) A list of the desired control plane logging to enable. For more information, see [Amazon EKS Control Plane Logging](https://docs.aws.amazon.com/eks/latest/userguide/control-plane-logs.html)
 * `tags` - (Optional) Key-value mapping of resource tags.
 * `version` – (Optional) Desired Kubernetes master version. If you do not specify a value, the latest available version at resource creation is used and no upgrades will occur except those automatically triggered by EKS. The value must be configured and increased to upgrade the version when desired. Downgrades are not supported by EKS.
+* `wait_for_endpoint` - (Optional) Wait for the Kubernetes Endpoint to be healthy.
 
 ### vpc_config
 
@@ -176,7 +177,7 @@ In addition to all arguments above, the following attributes are exported:
   * `oidc` - Nested attribute containing [OpenID Connect](https://openid.net/connect/) identity provider information for the cluster.
     * `issuer` - Issuer URL for the OpenID Connect identity provider.
 * `platform_version` - The platform version for the cluster.
-* `status` - The status of the EKS cluster. One of `CREATING`, `ACTIVE`, `DELETING`, `FAILED`. 
+* `status` - The status of the EKS cluster. One of `CREATING`, `ACTIVE`, `DELETING`, `FAILED`.
 * `version` - The Kubernetes server version for the cluster.
 * `vpc_config` - Additional nested attributes:
   * `cluster_security_group_id` - The cluster security group that was created by Amazon EKS for the cluster.