diff --git a/crates/tower-cmd/src/run.rs b/crates/tower-cmd/src/run.rs
index 1033e872..64f6cd5d 100644
--- a/crates/tower-cmd/src/run.rs
+++ b/crates/tower-cmd/src/run.rs
@@ -629,6 +629,7 @@ async fn get_catalogs(
                     })?;
             let name = property
                 .environment_variable
+                .filter(|s| !s.is_empty())
                 .unwrap_or_else(|| {
                     create_pyiceberg_catalog_property_name(&catalog.name, &property.name)
                 });