diff --git a/doc/changelog.d/6181.fixed.md b/doc/changelog.d/6181.fixed.md
new file mode 100644
index 00000000000..47d29c50787
--- /dev/null
+++ b/doc/changelog.d/6181.fixed.md
@@ -0,0 +1 @@
+improved ibis pin load time
\ No newline at end of file
diff --git a/src/ansys/aedt/core/generic/ibis_reader.py b/src/ansys/aedt/core/generic/ibis_reader.py
index 355f2e43c37..e101cc5da13 100644
--- a/src/ansys/aedt/core/generic/ibis_reader.py
+++ b/src/ansys/aedt/core/generic/ibis_reader.py
@@ -892,8 +892,8 @@ def import_model_in_aedt(self):
             ``True`` when the model is imported successfully, ``False`` if not imported or model already present.
 
         """
-
-        if [i for i in self._circuit.modeler.schematic.ocomponent_manager.GetNames() if i in self._ibis_model.buffers]:
+        names = [i.name for i in self._ibis_model.buffers.values()]
+        if [i for i in self._circuit.modeler.schematic.ocomponent_manager.GetNames() if i in names]:
             return False
 
         if self._circuit:
@@ -912,22 +912,22 @@ def import_model_in_aedt(self):
             for buffer_item in self._ibis_model.buffers.values():
                 arg_buffers.append(f"{buffer_item.short_name}:=")
                 arg_buffers.append([True, "IbisSingleEnded"])
-            model_selector_names = [i.name for i in self._ibis_model.model_selectors]
+            # model_selector_names = [i.name for i in self._ibis_model.model_selectors]
             arg_components = ["NAME:Components"]
             for comp_value in self._ibis_model.components.values():
                 arg_component = [f"NAME:{comp_value.name}"]
                 for pin in comp_value.pins.values():
                     arg_component.append(f"{pin.short_name}:=")
-                    if pin.model not in model_selector_names:
-                        arg_component.append([False, False])
-                    else:
-                        arg_component.append([True, False])
+                    # if pin.model not in model_selector_names:
+                    #     arg_component.append([False, False])
+                    # else:
+                    arg_component.append([True, False])
                 for pin in comp_value.differential_pins.values():
                     arg_component.append(f"{pin.short_name}:=")
-                    if pin.model not in model_selector_names:
-                        arg_component.append([False, True])
-                    else:
-                        arg_component.append([True, True])
+                    # if pin.model not in model_selector_names:
+                    #     arg_component.append([False, True])
+                    # else:
+                    arg_component.append([True, True])
                 arg_components.append(arg_component)
 
             args.append(arg_buffers)
@@ -1321,7 +1321,8 @@ def parse_ibis_file(self):
 
     def import_model_in_aedt(self):
 
-        if [i for i in self._circuit.modeler.schematic.ocomponent_manager.GetNames() if i in self._ibis_model.buffers]:
+        names = [i.name for i in self._ibis_model.buffers.values()]
+        if [i for i in self._circuit.modeler.schematic.ocomponent_manager.GetNames() if i in names]:
             return False
         if self._circuit:
             args = [
@@ -1339,22 +1340,22 @@ def import_model_in_aedt(self):
             for buffer in self._ibis_model.buffers:
                 arg_buffers.append(f"{self._ibis_model.buffers[buffer].short_name}:=")
                 arg_buffers.append([True, "IbisSingleEnded"])
-            model_selector_names = [i.name for i in self._ibis_model.model_selectors]
+            # model_selector_names = [i.name for i in self._ibis_model.model_selectors]
             arg_components = ["NAME:Components"]
             for component in self._ibis_model.components:
                 arg_component = [f"NAME:{self._ibis_model.components[component].name}"]
                 for pin in self._ibis_model.components[component].pins.values():
                     arg_component.append(f"{pin.short_name}:=")
-                    if model_selector_names and pin.model not in model_selector_names:
-                        arg_component.append([False, False])
-                    else:
-                        arg_component.append([True, False])
+                    # if model_selector_names and pin.model not in model_selector_names:
+                    #     arg_component.append([False, False])
+                    # else:
+                    arg_component.append([True, False])
                 for pin in self._ibis_model.components[component].differential_pins.values():
                     arg_component.append(f"{pin.short_name}:=")
-                    if model_selector_names and pin.model not in model_selector_names:
-                        arg_component.append([False, True])
-                    else:
-                        arg_component.append([True, True])
+                    # if model_selector_names and pin.model not in model_selector_names:
+                    #     arg_component.append([False, True])
+                    # else:
+                    arg_component.append([True, True])
                 arg_components.append(arg_component)
 
             args.append(arg_buffers)