diff --git a/databricks-s3-volume/main.tf b/databricks-s3-volume/main.tf
index 49916dea..695ca996 100644
--- a/databricks-s3-volume/main.tf
+++ b/databricks-s3-volume/main.tf
@@ -35,7 +35,7 @@ resource "databricks_storage_credential" "volume" {
     module.databricks_bucket
   ]
 
-  name = local.catalog_name
+  name = var.create_catalog ? local.catalog_name : local.volume_name
   aws_iam_role {
     role_arn = aws_iam_role.dbx_unity_aws_role[0].arn
   }