diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableNameBuilder.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableNameBuilder.java
index 6c8b233f8fcf..1fd2e4db33a5 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableNameBuilder.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/builder/TableNameBuilder.java
@@ -70,7 +70,7 @@ public String tableNameWithType(String tableName) {
    * @return Whether the table has type suffix that matches the builder type
    */
   private boolean tableHasTypeSuffix(String tableName) {
-    return tableName.endsWith(_typeSuffix);
+    return tableName.toUpperCase().endsWith(_typeSuffix);
   }
 
   /**