diff --git a/api/src/main/java/io/kafbat/ui/service/index/LuceneTopicsIndex.java b/api/src/main/java/io/kafbat/ui/service/index/LuceneTopicsIndex.java
index 3aa708806..4aa344331 100644
--- a/api/src/main/java/io/kafbat/ui/service/index/LuceneTopicsIndex.java
+++ b/api/src/main/java/io/kafbat/ui/service/index/LuceneTopicsIndex.java
@@ -74,8 +74,10 @@ private Directory build(List<InternalTopic> topics) {
         doc.add(new LongPoint(FIELD_SIZE, topic.getSegmentSize()));
         if (topic.getTopicConfigs() != null && !topic.getTopicConfigs().isEmpty()) {
           for (InternalTopicConfig topicConfig : topic.getTopicConfigs()) {
-            doc.add(new StringField(FIELD_CONFIG_PREFIX + "_" + topicConfig.getName(), topicConfig.getValue(),
-                Field.Store.NO));
+            if (topicConfig.getName() != null || topicConfig.getValue() != null) {
+              doc.add(new StringField(FIELD_CONFIG_PREFIX + "_" + topicConfig.getName(), topicConfig.getValue(),
+                  Field.Store.NO));
+            }
           }
         }
         doc.add(new StringField(FIELD_INTERNAL, String.valueOf(topic.isInternal()), Field.Store.NO));