diff --git a/src/blenderbim/blenderbim/core/bsdd.py b/src/blenderbim/blenderbim/core/bsdd.py
index 49efbf61d4..b15b2cf539 100644
--- a/src/blenderbim/blenderbim/core/bsdd.py
+++ b/src/blenderbim/blenderbim/core/bsdd.py
@@ -47,8 +47,6 @@ def load_bsdd(client: bsdd.Client, bsdd: tool.Bsdd) -> None:
 
 def search_class(keyword: str, client: bsdd.Client, bsdd: tool.Bsdd) -> int:
     bsdd.clear_classes()
-    if len(keyword) < 3:
-        return 0
     related_entities = bsdd.get_related_ifc_entities(keyword)
     active_dictionary_uri = bsdd.get_active_dictionary_uri()
     classes = bsdd.search_class(client, keyword, [active_dictionary_uri], related_entities)
diff --git a/src/blenderbim/blenderbim/tool/bsdd.py b/src/blenderbim/blenderbim/tool/bsdd.py
index 264413de1a..5b07d76288 100644
--- a/src/blenderbim/blenderbim/tool/bsdd.py
+++ b/src/blenderbim/blenderbim/tool/bsdd.py
@@ -112,10 +112,8 @@ class Bsdd(blenderbim.core.tool.Bsdd):
     def get_related_ifc_entities(cls, keyword: str) -> list[str]:
         active_object = bpy.context.active_object
         related_ifc_entities = []
-        # TODO: keyword length seems to be already double-checked in core.
-        # And {"FINISHED"} return value is never used.
         if len(keyword) < 3:
-            return {"FINISHED"}
+            return []
         if cls.should_filter_ifc_class() and active_object:
             element = tool.Ifc.get_entity(active_object)
             if element: