diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65a1d285..b10eab3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [6.1.5](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/compare/v6.1.4...v6.1.5) (2025-11-26)
+
+### Bug Fixes
+
+* Always pull a value from SSM data source since a computed value cannot be used in conditional logic ([#466](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/issues/466)) ([36fbf06](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/commit/36fbf06ff5d212a43e42d09a069c00afaf6afb31))
+
 ## [6.1.4](https://github.com/terraform-aws-modules/terraform-aws-ec2-instance/compare/v6.1.3...v6.1.4) (2025-10-22)
 
 ### Bug Fixes
diff --git a/main.tf b/main.tf
index 526ffd3d..341a26d5 100644
--- a/main.tf
+++ b/main.tf
@@ -5,7 +5,7 @@ locals {
 
   is_t_instance_type = replace(var.instance_type, "/^t(2|3|3a|4g){1}\\..*$/", "1") == "1" ? true : false
 
-  ami = try(coalesce(var.ami, try(nonsensitive(data.aws_ssm_parameter.this[0].value), null)), null)
+  ami = try(coalesce(var.ami, try(nonsensitive(data.aws_ssm_parameter.this.value), null)), null)
 
   instance_tags = merge(
     var.tags,
@@ -29,8 +29,6 @@ locals {
 }
 
 data "aws_ssm_parameter" "this" {
-  count = local.create && var.ami == null ? 1 : 0
-
   region = var.region
 
   name = var.ami_ssm_parameter