diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63cf796..890eea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
 ## [[v8.?.?](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v8.0.0...HEAD)] - 2019-12-11]
 
 - Write your awesome change here (by @you)
+- Fix index reference on destroy for output `oidc_provider_arn` (@stevie-)
 - Add support for restricting access to the public API endpoint (@sidprak)
 
 # History
diff --git a/outputs.tf b/outputs.tf
index e72b294..59a4077 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -65,7 +65,7 @@ output "kubeconfig_filename" {
 
 output "oidc_provider_arn" {
   description = "The ARN of the OIDC Provider if `enable_irsa = true`."
-  value       = var.enable_irsa ? aws_iam_openid_connect_provider.oidc_provider[0].arn : null
+  value       = var.enable_irsa ? concat(aws_iam_openid_connect_provider.oidc_provider[*].arn, [""])[0] : null
 }
 
 output "workers_asg_arns" {