diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf
index d6f5bb0..24d07c3 100644
--- a/solutions/fully-configurable/main.tf
+++ b/solutions/fully-configurable/main.tf
@@ -143,10 +143,10 @@ module "kms_instance_crn_parser" {
 }
 
 module "existing_kms_key_crn_parser" {
-  count   = var.kms_encryption_enabled_buckets ? 1 : 0
+  count   = var.existing_cos_kms_key_crn != null ? 1 : 0
   source  = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
   version = "1.2.0"
-  crn     = local.cos_kms_key_crn
+  crn     = var.existing_cos_kms_key_crn
 }
 
 module "kms" {
diff --git a/tests/pr_test.go b/tests/pr_test.go
index ca2daff..05c5121 100644
--- a/tests/pr_test.go
+++ b/tests/pr_test.go
@@ -293,3 +293,29 @@ func TestActivityTrackerDefaultConfiguration(t *testing.T) {
 	err := options.RunAddonTest()
 	require.NoError(t, err)
 }
+
+func TestDisabledCosRoutePlanOnly(t *testing.T) {
+	t.Parallel()
+
+	options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
+		Testing:                      t,
+		Prefix:                       "at-dis-cos",
+		ResourceGroup:                resourceGroup,
+		QuietMode:                    true, // Suppress logs except on failure
+		SkipInfrastructureDeployment: true,
+	})
+
+	options.AddonConfig = cloudinfo.NewAddonConfigTerraform(
+		options.Prefix,
+		"deploy-arch-ibm-activity-tracker",
+		"fully-configurable",
+		map[string]interface{}{
+			"region":                  validRegions[rand.Intn(len(validRegions))],
+			"existing_resource_group": resourceGroup,
+			"enable_activity_tracker_event_routing_to_cos_bucket": false,
+		},
+	)
+
+	err := options.RunAddonTest()
+	require.NoError(t, err)
+}