diff --git a/builtin/providers/aws/resource_aws_s3_bucket.go b/builtin/providers/aws/resource_aws_s3_bucket.go
index 011bda91cb..d1ace0a49c 100644
--- a/builtin/providers/aws/resource_aws_s3_bucket.go
+++ b/builtin/providers/aws/resource_aws_s3_bucket.go
@@ -219,8 +219,11 @@ func resourceAwsS3BucketCreate(d *schema.ResourceData, meta interface{}) error {
 				return fmt.Errorf("[WARN] Error creating S3 bucket %s, retrying: %s",
 					bucket, err)
 			}
+		}
+		if err != nil {
 			return resource.RetryError{Err: err}
 		}
+
 		return nil
 	})