diff --git a/src/app/shared/form/builder/form-builder.service.spec.ts b/src/app/shared/form/builder/form-builder.service.spec.ts
index d2cd887e82..1f6754e8d1 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -897,7 +897,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it(`should request the ${typeFieldProp} property and set value "dc_type"`, () => {
-    service.setTypeBindFieldFromConfig();
+    // This should have been called in the service constructor
     expect(configSpy.findByPropertyName).toHaveBeenCalledTimes(1);
     expect(configSpy.findByPropertyName).toHaveBeenCalledWith(typeFieldProp);
     expect(service.getTypeField()).toEqual('dc_type');
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 9cca31e755..01de94af3d 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -74,7 +74,7 @@ export class FormBuilderService extends DynamicFormService {
     super(componentService, validationService);
     this.formModels = new Map();
     this.formGroups = new Map();
-    if (hasValue(configService)) {
+    if (hasValue(configService) || true) {
       this.setTypeBindFieldFromConfig();
     } else {
       this.typeField = 'dc_type';
diff --git a/src/app/shared/mocks/find-id-config-data.service.mock.ts b/src/app/shared/mocks/find-id-config-data.service.mock.ts
new file mode 100644
index 0000000000..d378466fcc
--- /dev/null
+++ b/src/app/shared/mocks/find-id-config-data.service.mock.ts
@@ -0,0 +1,14 @@
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import {ConfigurationProperty} from "../../core/shared/configuration-property.model";
+
+export function getMockFindByIdDataService(propertyKey: string, ...values: string[]) {
+  return jasmine.createSpyObj('findByIdDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$({
+      ... new ConfigurationProperty(),
+      name: propertyKey,
+      values: values,
+    })
+  })
+}
+
+