diff --git a/src/openforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsFormFields.js b/src/openforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsFormFields.js
index 0489180a02..774f55539b 100644
--- a/src/openforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsFormFields.js
+++ b/src/openforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsFormFields.js
@@ -45,7 +45,7 @@ const ObjectsApiOptionsFormFields = ({index, name, schema, formData, onChange})
     You will also not be able to save the form until the variables are correctly mapped.
     Are you sure you want to continue?
     `,
-    description: 'V2 Switch warning message',
+    description: 'Objects API registration backend: v2 switch warning message',
   });
 
   const {
diff --git a/src/openforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsFormFields.stories.js b/src/openforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsFormFields.stories.js
index f665845b6a..238559abdf 100644
--- a/src/openforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsFormFields.stories.js
+++ b/src/openforms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiOptionsFormFields.stories.js
@@ -75,26 +75,23 @@ export const SwitchToV2Empty = {
     const canvas = within(canvasElement);
 
     const v2Tab = canvas.getByRole('tab', {selected: false});
-    userEvent.click(v2Tab);
+    await userEvent.click(v2Tab);
 
-    const objecttypeSelect = canvas.getByLabelText('Objecttype');
-    expect(objecttypeSelect.value).toBe(
+    await canvas.findByRole('option', {name: 'Tree (open)'});
+    expect(canvas.getByLabelText('Objecttype')).toHaveValue(
       'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f1'
     );
 
-    const objecttypeVersionSelect = canvas.getByLabelText('Objecttype version');
-    expect(objecttypeVersionSelect.value).toBe('2');
+    await canvas.findByRole('option', {name: '2 (draft)'});
+    expect(canvas.getByLabelText('Objecttype version')).toHaveValue('2');
 
     const v1Tab = canvas.getByRole('tab', {selected: false});
-    userEvent.click(v1Tab);
+    await userEvent.click(v1Tab);
 
-    const objecttypeInput = canvas.getByLabelText('Objecttype');
-    expect(objecttypeInput.value).toBe(
+    expect(canvas.getByLabelText('Objecttype')).toHaveValue(
       'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f1'
     );
-
-    const objecttypeVersionInput = canvas.getByLabelText('Objecttype version');
-    expect(objecttypeVersionInput.value).toBe('2');
+    expect(canvas.getByLabelText('Objecttype version')).toHaveValue(2);
   },
 };
 
@@ -110,26 +107,38 @@ export const SwitchToV2Existing = {
     const canvas = within(canvasElement);
 
     const v2Tab = canvas.getByRole('tab', {selected: false});
-    userEvent.click(v2Tab);
+    await userEvent.click(v2Tab);
 
-    const objecttypeSelect = canvas.getByLabelText('Objecttype');
-    expect(objecttypeSelect.value).toBe(
-      'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f2'
-    );
+    await waitFor(async () => {
+      const objecttypeSelect = canvas.getByLabelText('Objecttype');
+
+      await expect(objecttypeSelect.value).toBe(
+        'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f2'
+      );
+    });
+
+    await waitFor(async () => {
+      const objecttypeVersionSelect = canvas.getByLabelText('Objecttype version');
 
-    const objecttypeVersionSelect = canvas.getByLabelText('Objecttype version');
-    expect(objecttypeVersionSelect.value).toBe('1');
+      await expect(objecttypeVersionSelect.value).toBe('1');
+    });
 
     const v1Tab = canvas.getByRole('tab', {selected: false});
-    userEvent.click(v1Tab);
+    await userEvent.click(v1Tab);
 
-    const objecttypeInput = canvas.getByLabelText('Objecttype');
-    expect(objecttypeInput.value).toBe(
-      'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f2'
-    );
+    await waitFor(async () => {
+      const objecttypeInput = canvas.getByLabelText('Objecttype');
+
+      await expect(objecttypeInput.value).toBe(
+        'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f2'
+      );
+    });
 
-    const objecttypeVersionInput = canvas.getByLabelText('Objecttype version');
-    expect(objecttypeVersionInput.value).toBe('1');
+    await waitFor(async () => {
+      const objecttypeVersionInput = canvas.getByLabelText('Objecttype version');
+
+      await expect(objecttypeVersionInput.value).toBe('1');
+    });
   },
 };
 
@@ -145,25 +154,37 @@ export const SwitchToV2NonExisting = {
     const canvas = within(canvasElement);
 
     const v2Tab = canvas.getByRole('tab', {selected: false});
-    userEvent.click(v2Tab);
+    await userEvent.click(v2Tab);
 
-    const objecttypeSelect = canvas.getByLabelText('Objecttype');
-    expect(objecttypeSelect.value).toBe(
-      'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f1'
-    );
+    await waitFor(async () => {
+      const objecttypeSelect = canvas.getByLabelText('Objecttype');
+
+      await expect(objecttypeSelect.value).toBe(
+        'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f1'
+      );
+    });
 
-    const objecttypeVersionSelect = canvas.getByLabelText('Objecttype version');
-    expect(objecttypeVersionSelect.value).toBe('2');
+    await waitFor(async () => {
+      const objecttypeVersionSelect = canvas.getByLabelText('Objecttype version');
+
+      await expect(objecttypeVersionSelect.value).toBe('2');
+    });
 
     const v1Tab = canvas.getByRole('tab', {selected: false});
-    userEvent.click(v1Tab);
+    await userEvent.click(v1Tab);
 
-    const objecttypeInput = canvas.getByLabelText('Objecttype');
-    expect(objecttypeInput.value).toBe(
-      'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f1'
-    );
+    await waitFor(async () => {
+      const objecttypeInput = canvas.getByLabelText('Objecttype');
+
+      await expect(objecttypeInput.value).toBe(
+        'https://objecttypen.nl/api/v1/objecttypes/2c77babf-a967-4057-9969-0200320d23f1'
+      );
+    });
+
+    await waitFor(async () => {
+      const objecttypeVersionInput = canvas.getByLabelText('Objecttype version');
 
-    const objecttypeVersionInput = canvas.getByLabelText('Objecttype version');
-    expect(objecttypeVersionInput.value).toBe('2');
+      await expect(objecttypeVersionInput.value).toBe('2');
+    });
   },
 };