diff --git a/src/ifcblenderexport/blenderbim/bim/module/root/ui.py b/src/ifcblenderexport/blenderbim/bim/module/root/ui.py
index d7d428f673..b973cfa1f0 100644
--- a/src/ifcblenderexport/blenderbim/bim/module/root/ui.py
+++ b/src/ifcblenderexport/blenderbim/bim/module/root/ui.py
@@ -42,7 +42,10 @@ class BIM_PT_class(Panel):
                 row.operator("bim.copy_class", icon="DUPLICATE", text="").obj = context.active_object.name
                 row.operator("bim.unlink_object", icon="UNLINKED", text="")
                 row.operator("bim.enable_reassign_class", icon="GREASEPENCIL", text="")
-                row.operator("bim.unassign_class", icon="X", text="").obj = context.active_object.name
+                if context.selected_objects:
+                    row.operator("bim.unassign_class", icon="X", text="")
+                else:
+                    row.operator("bim.unassign_class", icon="X", text="").obj = context.active_object.name
         else:
             self.draw_class_dropdowns()
             row = self.layout.row(align=True)
diff --git a/src/ifcblenderexport/blenderbim/bim/module/type/assign_type.py b/src/ifcblenderexport/blenderbim/bim/module/type/assign_type.py
index 50e72813b7..fe936f02d2 100644
--- a/src/ifcblenderexport/blenderbim/bim/module/type/assign_type.py
+++ b/src/ifcblenderexport/blenderbim/bim/module/type/assign_type.py
@@ -33,7 +33,7 @@ class Usecase:
             if related_objects:
                 is_typed_by[0].RelatedObjects = related_objects
             else:
-                self.file.remove(is_typed_by)
+                self.file.remove(is_typed_by[0])
 
         if types:
             related_objects = list(types[0].RelatedObjects)