diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index a2a0b28a5c6..9f147953422 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -31,7 +31,6 @@ <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-cente
                  [openDelay]="500"
                  container="body"
           >
-            <!-- checkbox (click) needs to be stopped, to prevent that button (click) gets called twice -->
             <input class="mr-2" type="checkbox"
                    [disabled]="!node.item?.selectable"
                    [checked]="node.isSelected"
@@ -64,7 +63,6 @@ <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-cente
                 [ngbTooltip]="node.item?.otherInformation?.note"
                 [openDelay]="500"
                 container="body">
-            <!-- checkbox (click) needs to be stopped, to prevent that button (click) gets called twice -->
             <input class="mr-2" type="checkbox"
                    [disabled]="!node.item?.selectable"
                    [checked]="node.isSelected"
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts
index e5f5145e0a0..9ca8d7ab8b4 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts
@@ -90,7 +90,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
   }));
 
   afterEach(() => {
-    fixture.destroy();
+    fixture?.destroy();
     comp = null;
     compAsAny = null;
   });
@@ -264,14 +264,14 @@ describe('VocabularyTreeviewComponent test suite', () => {
 
     it('should not display checkboxes by default', async () => {
       fixture.detectChanges();
-      expect(de.query(By.css('.form-check-input'))).toBeNull();
+      expect(de.query(By.css('input[type=checkbox]'))).toBeNull();
       expect(de.queryAll(By.css('cdk-tree-node')).length).toEqual(3);
     });
 
     it('should display checkboxes if multiSelect is true', async () => {
       comp.multiSelect = true;
       fixture.detectChanges();
-      expect(de.queryAll(By.css('.form-check-input')).length).toEqual(3);
+      expect(de.queryAll(By.css('input[type=checkbox]')).length).toEqual(3);
       expect(de.queryAll(By.css('cdk-tree-node')).length).toEqual(3);
     });
   });