diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadata.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadata.java
index d26f15bf5b9d..decf3199255d 100644
--- a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadata.java
+++ b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiMetadata.java
@@ -325,7 +325,7 @@ private ConnectorTableMetadata getTableMetadata(SchemaTableName tableName, Colle
 
         ImmutableMap.Builder<String, Object> properties = ImmutableMap.builder();
         // Location property
-        String location = table.getStorage().getLocation();
+        String location = table.getStorage().getOptionalLocation().orElse(null);
         if (!isNullOrEmpty(location)) {
             properties.put(LOCATION_PROPERTY, location);
         }