diff --git a/infobip-spring-data-jdbc-annotation-processor-common/src/main/java/com/infobip/spring/data/jdbc/annotation/processor/CustomExtendedTypeFactory.java b/infobip-spring-data-jdbc-annotation-processor-common/src/main/java/com/infobip/spring/data/jdbc/annotation/processor/CustomExtendedTypeFactory.java
index 9b0012d..9bb4a08 100644
--- a/infobip-spring-data-jdbc-annotation-processor-common/src/main/java/com/infobip/spring/data/jdbc/annotation/processor/CustomExtendedTypeFactory.java
+++ b/infobip-spring-data-jdbc-annotation-processor-common/src/main/java/com/infobip/spring/data/jdbc/annotation/processor/CustomExtendedTypeFactory.java
@@ -24,6 +24,7 @@
 import com.querydsl.codegen.TypeMappings;
 import com.querydsl.codegen.utils.model.TypeCategory;
 import org.springframework.data.relational.core.mapping.Table;
+import org.springframework.util.StringUtils;
 
 public class CustomExtendedTypeFactory extends ExtendedTypeFactory {
 
@@ -142,6 +143,7 @@ protected String getTableName(EntityType model) {
         return Optional.ofNullable(elements.getTypeElement(className)
                                            .getAnnotation(Table.class))
                        .map(this::getTableName)
+                       .filter(StringUtils::hasText)
                        .orElse(tableName);
     }