diff --git a/backend/src/Designer/Controllers/OptionsController.cs b/backend/src/Designer/Controllers/OptionsController.cs
index 6377fbecae3..56f23452ce0 100644
--- a/backend/src/Designer/Controllers/OptionsController.cs
+++ b/backend/src/Designer/Controllers/OptionsController.cs
@@ -3,6 +3,7 @@
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Altinn.Studio.Designer.Exceptions.Options;
 using Altinn.Studio.Designer.Helpers;
 using Altinn.Studio.Designer.Models;
 using Altinn.Studio.Designer.Models.Dto;
@@ -57,20 +58,40 @@ public ActionResult<string[]> GetOptionsListIds(string org, string repo)
     /// </summary>
     /// <param name="org">Unique identifier of the organisation responsible for the app.</param>
     /// <param name="repo">Application identifier which is unique within an organisation.</param>
-    /// <returns>Dictionary of all option lists belonging to the app</returns>
+    /// <returns>List of <see cref="OptionListData" /> objects with all option lists belonging to the app with data
+    /// set if option list is valid, or hasError set if option list is invalid.</returns>
     [HttpGet]
     [Route("option-lists")]
-    public async Task<ActionResult<Dictionary<string, List<Option>>>> GetOptionLists(string org, string repo)
+    public async Task<ActionResult<List<OptionListData>>> GetOptionLists(string org, string repo)
     {
         try
         {
             string developer = AuthenticationHelper.GetDeveloperUserName(HttpContext);
             string[] optionListIds = _optionsService.GetOptionsListIds(org, repo, developer);
-            Dictionary<string, List<Option>> optionLists = [];
+            List<OptionListData> optionLists = [];
             foreach (string optionListId in optionListIds)
             {
-                List<Option> optionList = await _optionsService.GetOptionsList(org, repo, developer, optionListId);
-                optionLists.Add(optionListId, optionList);
+                try
+                {
+                    List<Option> optionList = await _optionsService.GetOptionsList(org, repo, developer, optionListId);
+                    OptionListData optionListData = new()
+                    {
+                        Title = optionListId,
+                        Data = optionList,
+                        HasError = false
+                    };
+                    optionLists.Add(optionListData);
+                }
+                catch (InvalidOptionsFormatException)
+                {
+                    OptionListData optionListData = new()
+                    {
+                        Title = optionListId,
+                        Data = null,
+                        HasError = true
+                    };
+                    optionLists.Add(optionListData);
+                }
             }
             return Ok(optionLists);
         }
diff --git a/backend/src/Designer/Models/Dto/OptionListData.cs b/backend/src/Designer/Models/Dto/OptionListData.cs
new file mode 100644
index 00000000000..6357ea1e566
--- /dev/null
+++ b/backend/src/Designer/Models/Dto/OptionListData.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using JetBrains.Annotations;
+
+namespace Altinn.Studio.Designer.Models.Dto;
+
+public class OptionListData
+{
+    [JsonPropertyName("title")]
+    public string Title { get; set; }
+    [JsonPropertyName("data")]
+    [CanBeNull] public List<Option> Data { get; set; }
+    [JsonPropertyName("hasError")]
+    public bool? HasError { get; set; }
+}
diff --git a/backend/tests/Designer.Tests/Controllers/OptionsController/GetOptionsTests.cs b/backend/tests/Designer.Tests/Controllers/OptionsController/GetOptionsTests.cs
index fc3c00fbc0a..010ca0521f9 100644
--- a/backend/tests/Designer.Tests/Controllers/OptionsController/GetOptionsTests.cs
+++ b/backend/tests/Designer.Tests/Controllers/OptionsController/GetOptionsTests.cs
@@ -1,9 +1,11 @@
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Altinn.Studio.Designer.Filters;
 using Altinn.Studio.Designer.Models;
+using Altinn.Studio.Designer.Models.Dto;
 using Designer.Tests.Controllers.ApiTests;
 using FluentAssertions;
 using Microsoft.AspNetCore.Http;
@@ -56,6 +58,29 @@ public async Task GetOptionsListIds_Returns200OK_WithEmptyOptionsListIdArray_Whe
         Assert.Empty(responseList);
     }
 
+    [Fact]
+    public async Task GetOptionLists_Returns200OK_WithOptionListsData()
+    {
+        // Arrange
+        const string repo = "app-with-options";
+        string apiUrl = $"/designer/api/ttd/{repo}/options/option-lists";
+        using HttpRequestMessage httpRequestMessage = new(HttpMethod.Get, apiUrl);
+
+        // Act
+        using HttpResponseMessage response = await HttpClient.SendAsync(httpRequestMessage);
+        string responseBody = await response.Content.ReadAsStringAsync();
+        List<OptionListData> responseList = JsonSerializer.Deserialize<List<OptionListData>>(responseBody);
+
+        // Assert
+        Assert.Equal(StatusCodes.Status200OK, (int)response.StatusCode);
+        responseList.Should().BeEquivalentTo(new List<OptionListData>
+        {
+            new () { Title = "options-with-null-fields", Data = null, HasError = true },
+            new () { Title = "other-options", HasError = false },
+            new () { Title = "test-options", HasError = false }
+        }, options => options.Excluding(x => x.Data));
+    }
+
     [Fact]
     public async Task GetSingleOptionsList_Returns200Ok_WithOptionsList()
     {
diff --git a/frontend/app-development/features/appContentLibrary/AppContentLibrary.test.tsx b/frontend/app-development/features/appContentLibrary/AppContentLibrary.test.tsx
index 8fdf92d0c90..2ab2d32e1af 100644
--- a/frontend/app-development/features/appContentLibrary/AppContentLibrary.test.tsx
+++ b/frontend/app-development/features/appContentLibrary/AppContentLibrary.test.tsx
@@ -9,9 +9,9 @@ import { app, org } from '@studio/testing/testids';
 import { queriesMock } from 'app-shared/mocks/queriesMock';
 import type { UserEvent } from '@testing-library/user-event';
 import userEvent from '@testing-library/user-event';
-import type { OptionsLists } from 'app-shared/types/api/OptionsLists';
 import type { CodeList } from '@studio/components';
 import type { ServicesContextProps } from 'app-shared/contexts/ServicesContext';
+import type { OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
 
 const uploadCodeListButtonTextMock = 'Upload Code List';
 const updateCodeListButtonTextMock = 'Update Code List';
@@ -19,6 +19,7 @@ const updateCodeListIdButtonTextMock = 'Update Code List Id';
 const codeListNameMock = 'codeListNameMock';
 const newCodeListNameMock = 'newCodeListNameMock';
 const codeListMock: CodeList = [{ value: '', label: '' }];
+const optionListsDataMock: OptionsListsResponse = [{ title: codeListNameMock, data: codeListMock }];
 jest.mock(
   '../../../libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage',
   () => ({
@@ -46,10 +47,6 @@ jest.mock(
   }),
 );
 
-const optionListsMock: OptionsLists = {
-  list1: [{ label: 'label', value: 'value' }],
-};
-
 describe('AppContentLibrary', () => {
   afterEach(jest.clearAllMocks);
 
@@ -66,7 +63,7 @@ describe('AppContentLibrary', () => {
   });
 
   it('renders a spinner when waiting for option lists', () => {
-    renderAppContentLibrary({ optionLists: {} });
+    renderAppContentLibrary({ optionListsData: [] });
     const spinner = screen.getByText(textMock('general.loading'));
     expect(spinner).toBeInTheDocument();
   });
@@ -123,7 +120,7 @@ describe('AppContentLibrary', () => {
 
   it('calls onUpdateOptionListId when onUpdateCodeListId is triggered', async () => {
     const user = userEvent.setup();
-    renderAppContentLibrary(optionListsMock);
+    renderAppContentLibrary();
     await goToLibraryPage(user, 'code_lists');
     const updateCodeListIdButton = screen.getByRole('button', {
       name: updateCodeListIdButtonTextMock,
@@ -149,16 +146,16 @@ const goToLibraryPage = async (user: UserEvent, libraryPage: string) => {
 
 type renderAppContentLibraryProps = {
   queries?: Partial<ServicesContextProps>;
-  optionLists?: OptionsLists;
+  optionListsData?: OptionsListsResponse;
 };
 
 const renderAppContentLibrary = ({
   queries = {},
-  optionLists = optionListsMock,
+  optionListsData = optionListsDataMock,
 }: renderAppContentLibraryProps = {}) => {
   const queryClientMock = createQueryClientMock();
-  if (Object.keys(optionLists).length) {
-    queryClientMock.setQueryData([QueryKey.OptionLists, org, app], optionLists);
+  if (optionListsData.length) {
+    queryClientMock.setQueryData([QueryKey.OptionLists, org, app], optionListsData);
   }
   renderWithProviders(queries, queryClientMock)(<AppContentLibrary />);
 };
diff --git a/frontend/app-development/features/appContentLibrary/AppContentLibrary.tsx b/frontend/app-development/features/appContentLibrary/AppContentLibrary.tsx
index 663237953f8..c7ce3b9d4d1 100644
--- a/frontend/app-development/features/appContentLibrary/AppContentLibrary.tsx
+++ b/frontend/app-development/features/appContentLibrary/AppContentLibrary.tsx
@@ -1,9 +1,9 @@
 import type { CodeListWithMetadata } from '@studio/content-library';
 import { ResourceContentLibraryImpl } from '@studio/content-library';
 import React from 'react';
-import { useOptionListsQuery } from 'app-shared/hooks/queries/useOptionListsQuery';
+import { useOptionListsQuery } from 'app-shared/hooks/queries';
 import { useStudioEnvironmentParams } from 'app-shared/hooks/useStudioEnvironmentParams';
-import { convertOptionListsToCodeLists } from './utils/convertOptionListsToCodeLists';
+import { convertOptionsListsDataToCodeListsData } from './utils/convertOptionsListsDataToCodeListsData';
 import { StudioPageSpinner } from '@studio/components';
 import { useTranslation } from 'react-i18next';
 import type { ApiError } from 'app-shared/types/api/ApiError';
@@ -19,21 +19,20 @@ import {
 export function AppContentLibrary(): React.ReactElement {
   const { org, app } = useStudioEnvironmentParams();
   const { t } = useTranslation();
-  const {
-    data: optionLists,
-    isPending: optionListsPending,
-    isError: optionListsError,
-  } = useOptionListsQuery(org, app);
+  const { data: optionListsData, isPending: optionListsDataPending } = useOptionListsQuery(
+    org,
+    app,
+  );
   const { mutate: uploadOptionList } = useAddOptionListMutation(org, app, {
     hideDefaultError: (error: AxiosError<ApiError>) => isErrorUnknown(error),
   });
   const { mutate: updateOptionList } = useUpdateOptionListMutation(org, app);
   const { mutate: updateOptionListId } = useUpdateOptionListIdMutation(org, app);
 
-  if (optionListsPending)
+  if (optionListsDataPending)
     return <StudioPageSpinner spinnerTitle={t('general.loading')}></StudioPageSpinner>;
 
-  const codeLists = convertOptionListsToCodeLists(optionLists);
+  const codeListsData = convertOptionsListsDataToCodeListsData(optionListsData);
 
   const handleUpdateCodeListId = (optionListId: string, newOptionListId: string) => {
     updateOptionListId({ optionListId, newOptionListId });
@@ -60,11 +59,10 @@ export function AppContentLibrary(): React.ReactElement {
     pages: {
       codeList: {
         props: {
-          codeLists: codeLists,
+          codeListsData,
           onUpdateCodeListId: handleUpdateCodeListId,
           onUpdateCodeList: handleUpdate,
           onUploadCodeList: handleUpload,
-          fetchDataError: optionListsError,
         },
       },
       images: {
diff --git a/frontend/app-development/features/appContentLibrary/utils/convertOptionListsToCodeLists.test.ts b/frontend/app-development/features/appContentLibrary/utils/convertOptionListsToCodeLists.test.ts
deleted file mode 100644
index dbb6c5262db..00000000000
--- a/frontend/app-development/features/appContentLibrary/utils/convertOptionListsToCodeLists.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { CodeListWithMetadata } from '@studio/content-library';
-import { convertOptionListsToCodeLists } from './convertOptionListsToCodeLists';
-import type { OptionsLists } from 'app-shared/types/api/OptionsLists';
-
-describe('convertOptionListsToCodeLists', () => {
-  it('converts option lists map to code lists array correctly', () => {
-    const optionLists: OptionsLists = {
-      list1: [
-        { label: 'Option 1', value: '1' },
-        { label: 'Option 2', value: '2' },
-      ],
-      list2: [
-        { label: 'Option A', value: 'A' },
-        { label: 'Option B', value: 'B' },
-      ],
-    };
-    const result: CodeListWithMetadata[] = convertOptionListsToCodeLists(optionLists);
-    expect(result).toEqual([
-      {
-        title: 'list1',
-        codeList: [
-          { label: 'Option 1', value: '1' },
-          { label: 'Option 2', value: '2' },
-        ],
-      },
-      {
-        title: 'list2',
-        codeList: [
-          { label: 'Option A', value: 'A' },
-          { label: 'Option B', value: 'B' },
-        ],
-      },
-    ]);
-  });
-
-  it('returns an empty array when the input map is empty', () => {
-    const optionLists: OptionsLists = {};
-    const result: CodeListWithMetadata[] = convertOptionListsToCodeLists(optionLists);
-    expect(result).toEqual([]);
-  });
-});
diff --git a/frontend/app-development/features/appContentLibrary/utils/convertOptionListsToCodeLists.ts b/frontend/app-development/features/appContentLibrary/utils/convertOptionListsToCodeLists.ts
deleted file mode 100644
index 576e9fa0c0c..00000000000
--- a/frontend/app-development/features/appContentLibrary/utils/convertOptionListsToCodeLists.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { CodeListWithMetadata } from '@studio/content-library';
-import type { OptionsLists } from 'app-shared/types/api/OptionsLists';
-
-export function convertOptionListsToCodeLists(optionLists: OptionsLists): CodeListWithMetadata[] {
-  const codeLists = [];
-  Object.entries(optionLists).map((optionList) =>
-    codeLists.push({
-      codeList: optionList[1],
-      title: optionList[0],
-    }),
-  );
-  return codeLists;
-}
diff --git a/frontend/app-development/features/appContentLibrary/utils/convertOptionsListsDataToCodeListsData.test.ts b/frontend/app-development/features/appContentLibrary/utils/convertOptionsListsDataToCodeListsData.test.ts
new file mode 100644
index 00000000000..7d67033df69
--- /dev/null
+++ b/frontend/app-development/features/appContentLibrary/utils/convertOptionsListsDataToCodeListsData.test.ts
@@ -0,0 +1,49 @@
+import type { CodeListData } from '@studio/content-library';
+import { convertOptionsListsDataToCodeListsData } from './convertOptionsListsDataToCodeListsData';
+import type { OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
+
+describe('convertOptionsListsDataToCodeListsData', () => {
+  it('converts option lists data to code lists data correctly', () => {
+    const optionListId: string = 'optionListId';
+    const optionListsData: OptionsListsResponse = [
+      {
+        title: optionListId,
+        data: [
+          { label: 'Option 1', value: '1' },
+          { label: 'Option 2', value: '2' },
+        ],
+        hasError: false,
+      },
+    ];
+    const result: CodeListData[] = convertOptionsListsDataToCodeListsData(optionListsData);
+    expect(result).toEqual([
+      {
+        title: optionListId,
+        data: [
+          { label: 'Option 1', value: '1' },
+          { label: 'Option 2', value: '2' },
+        ],
+        hasError: false,
+      },
+    ]);
+  });
+
+  it('sets hasError to true in result when optionListsResponse returns an option list with error', () => {
+    const optionListId: string = 'optionListId';
+    const optionListsData: OptionsListsResponse = [
+      {
+        title: optionListId,
+        data: null,
+        hasError: true,
+      },
+    ];
+    const result: CodeListData[] = convertOptionsListsDataToCodeListsData(optionListsData);
+    expect(result).toEqual([{ title: optionListId, data: null, hasError: true }]);
+  });
+
+  it('returns a result with empty code list data array when the input option list data is empty', () => {
+    const optionListsData: OptionsListsResponse = [];
+    const result: CodeListData[] = convertOptionsListsDataToCodeListsData(optionListsData);
+    expect(result).toEqual([]);
+  });
+});
diff --git a/frontend/app-development/features/appContentLibrary/utils/convertOptionsListsDataToCodeListsData.ts b/frontend/app-development/features/appContentLibrary/utils/convertOptionsListsDataToCodeListsData.ts
new file mode 100644
index 00000000000..e9d386db542
--- /dev/null
+++ b/frontend/app-development/features/appContentLibrary/utils/convertOptionsListsDataToCodeListsData.ts
@@ -0,0 +1,20 @@
+import type { OptionsListData, OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
+import type { CodeListData } from '@studio/content-library';
+
+export const convertOptionsListsDataToCodeListsData = (optionListsData: OptionsListsResponse) => {
+  const codeListsData = [];
+  optionListsData.map((optionListData) => {
+    const codeListData = convertOptionsListDataToCodeListData(optionListData);
+    codeListsData.push(codeListData);
+  });
+  return codeListsData;
+};
+
+const convertOptionsListDataToCodeListData = (optionListData: OptionsListData) => {
+  const codeListData: CodeListData = {
+    title: optionListData.title,
+    data: optionListData.data,
+    hasError: optionListData.hasError,
+  };
+  return codeListData;
+};
diff --git a/frontend/language/src/nb.json b/frontend/language/src/nb.json
index 25dbd13d710..c826889c6e6 100644
--- a/frontend/language/src/nb.json
+++ b/frontend/language/src/nb.json
@@ -23,7 +23,7 @@
   "app_content_library.code_lists.create_new_code_list_modal_title": "Lag ny kodeliste",
   "app_content_library.code_lists.create_new_code_list_name": "Navn",
   "app_content_library.code_lists.edit_code_list_placeholder_text": "Her kommer det redigeringsmuligheter snart",
-  "app_content_library.code_lists.fetch_error": "Kunne ikke hente kodelister fra appen.",
+  "app_content_library.code_lists.fetch_error": "Kunne ikke hente kodelisten fra appen.",
   "app_content_library.code_lists.info_box.description": "En kodeliste er en liste med strukturerte data. Den inneholder definerte alternativer som alle har en unik kode. For eksempel kan du ha en kodeliste med kommunenavn i skjemaet ditt, som brukerne kan velge fra en nedtrekksmeny. Brukerne ser bare navnet, ikke koden.",
   "app_content_library.code_lists.info_box.title": "Hva er en kodeliste?",
   "app_content_library.code_lists.no_content": "Dette biblioteket har ingen kodelister",
diff --git a/frontend/libs/studio-content-library/mocks/mockPagesConfig.ts b/frontend/libs/studio-content-library/mocks/mockPagesConfig.ts
index 58690a66167..f600db463bd 100644
--- a/frontend/libs/studio-content-library/mocks/mockPagesConfig.ts
+++ b/frontend/libs/studio-content-library/mocks/mockPagesConfig.ts
@@ -1,16 +1,20 @@
 import type { PagesConfig } from '../src/types/PagesProps';
+import type { CodeListData } from '../src';
+
+export const codeListData: CodeListData = {
+  title: 'CodeList1',
+  data: [{ value: 'value', label: 'label' }],
+  hasError: false,
+};
+export const codeListsDataMock: CodeListData[] = [codeListData];
 
 export const mockPagesConfig: PagesConfig = {
   codeList: {
     props: {
-      codeLists: [
-        { title: 'CodeList1', codeList: [] },
-        { title: 'CodeList2', codeList: [] },
-      ],
+      codeListsData: codeListsDataMock,
       onUpdateCodeListId: () => {},
       onUpdateCodeList: () => {},
       onUploadCodeList: () => {},
-      fetchDataError: false,
     },
   },
   images: {
diff --git a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeListPage.test.tsx b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeListPage.test.tsx
index a966897efe4..0566b6bf598 100644
--- a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeListPage.test.tsx
+++ b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeListPage.test.tsx
@@ -1,27 +1,23 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import type { CodeListPageProps, CodeListWithMetadata } from './CodeListPage';
+import type { CodeListPageProps } from './CodeListPage';
 import { CodeListPage } from './CodeListPage';
 import userEvent from '@testing-library/user-event';
 import type { UserEvent } from '@testing-library/user-event';
 import { textMock } from '@studio/testing/mocks/i18nMock';
 import type { CodeList as StudioComponentCodeList } from '@studio/components';
+import { codeListsDataMock } from '../../../../../mocks/mockPagesConfig';
 
 const onUpdateCodeListIdMock = jest.fn();
 const onUpdateCodeListMock = jest.fn();
 const onUploadCodeListMock = jest.fn();
-const codeListName = 'codeList';
+const codeListName = codeListsDataMock[0].title;
 const codeListMock: StudioComponentCodeList = [{ value: 'value', label: 'label' }];
-const codeListWithMetadataMock: CodeListWithMetadata = {
-  title: codeListName,
-  codeList: codeListMock,
-};
 const uploadedCodeListName = 'uploadedCodeListName';
 
 describe('CodeListPage', () => {
   afterEach(() => {
-    defaultCodeListPageProps.codeLists = [codeListWithMetadataMock];
-    defaultCodeListPageProps.fetchDataError = false;
+    defaultCodeListPageProps.codeListsData = [...codeListsDataMock];
     jest.clearAllMocks();
   });
 
@@ -55,6 +51,12 @@ describe('CodeListPage', () => {
     expect(codeListUploadButton).toBeInTheDocument();
   });
 
+  it('renders the code list as a clickable element', () => {
+    renderCodeListPage();
+    const codeListAccordion = screen.getByRole('button', { name: codeListName });
+    expect(codeListAccordion).toBeInTheDocument();
+  });
+
   it('renders the code list accordion', () => {
     renderCodeListPage();
     const codeListAccordion = screen.getByTitle(
@@ -74,19 +76,11 @@ describe('CodeListPage', () => {
     });
     expect(codeListAccordionClosed).toHaveAttribute('aria-expanded', 'false');
     await uploadCodeList(user, uploadedCodeListName);
-    defaultCodeListPageProps.codeLists.push({
+    defaultCodeListPageProps.codeListsData.push({
       title: uploadedCodeListName,
-      codeList: codeListMock,
+      data: codeListMock,
     });
-    rerender(
-      <CodeListPage
-        codeLists={defaultCodeListPageProps.codeLists}
-        onUpdateCodeListId={onUpdateCodeListIdMock}
-        onUpdateCodeList={onUpdateCodeListMock}
-        onUploadCodeList={onUploadCodeListMock}
-        fetchDataError={defaultCodeListPageProps.fetchDataError}
-      />,
-    );
+    rerender(<CodeListPage {...defaultCodeListPageProps} />);
     const codeListAccordionOpen = screen.getByRole('button', {
       name: uploadedCodeListName,
       expanded: true,
@@ -94,12 +88,6 @@ describe('CodeListPage', () => {
     expect(codeListAccordionOpen).toHaveAttribute('aria-expanded', 'true');
   });
 
-  it('renders error message if error fetching option lists occurred', () => {
-    renderCodeListPage({ fetchDataError: true });
-    const errorMessage = screen.getByText(textMock('app_content_library.code_lists.fetch_error'));
-    expect(errorMessage).toBeInTheDocument();
-  });
-
   it('calls onUpdateCodeListId when Id is changed', async () => {
     const user = userEvent.setup();
     renderCodeListPage();
@@ -115,8 +103,8 @@ describe('CodeListPage', () => {
     await changeCodeListContent(user, newValueText);
     expect(onUpdateCodeListMock).toHaveBeenCalledTimes(1);
     expect(onUpdateCodeListMock).toHaveBeenLastCalledWith({
-      ...codeListWithMetadataMock,
-      codeList: [{ ...codeListWithMetadataMock.codeList[0], value: newValueText }],
+      codeList: [{ ...codeListsDataMock[0].data[0], value: newValueText }],
+      title: codeListName,
     });
   });
 
@@ -161,22 +149,13 @@ const uploadCodeList = async (user: UserEvent, fileName: string = uploadedCodeLi
   await user.upload(fileUploaderButton, file);
 };
 
-const defaultCodeListPageProps: Partial<CodeListPageProps> = {
-  codeLists: [codeListWithMetadataMock],
-  fetchDataError: false,
+const defaultCodeListPageProps: CodeListPageProps = {
+  codeListsData: codeListsDataMock,
+  onUpdateCodeListId: onUpdateCodeListIdMock,
+  onUpdateCodeList: onUpdateCodeListMock,
+  onUploadCodeList: onUploadCodeListMock,
 };
 
-const renderCodeListPage = ({
-  codeLists,
-  fetchDataError,
-}: Partial<CodeListPageProps> = defaultCodeListPageProps) => {
-  return render(
-    <CodeListPage
-      codeLists={codeLists}
-      onUpdateCodeListId={onUpdateCodeListIdMock}
-      onUpdateCodeList={onUpdateCodeListMock}
-      onUploadCodeList={onUploadCodeListMock}
-      fetchDataError={fetchDataError}
-    />,
-  );
+const renderCodeListPage = (props: Partial<CodeListPageProps> = {}) => {
+  return render(<CodeListPage {...defaultCodeListPageProps} {...props} />);
 };
diff --git a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeListPage.tsx b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeListPage.tsx
index db9744acf9f..d8350981b89 100644
--- a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeListPage.tsx
+++ b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeListPage.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
-import { StudioHeading, StudioPageError } from '@studio/components';
-import type { CodeList as StudioComponentCodeList } from '@studio/components';
+import { StudioHeading } from '@studio/components';
+import type { CodeList } from '@studio/components';
 import { useTranslation } from 'react-i18next';
 import { CodeListsActionsBar } from './CodeListsActionsBar';
 import { CodeLists } from './CodeLists';
@@ -9,31 +9,33 @@ import classes from './CodeListPage.module.css';
 import { ArrayUtils, FileNameUtils } from '@studio/pure-functions';
 
 export type CodeListWithMetadata = {
-  codeList: StudioComponentCodeList;
+  codeList: CodeList;
   title: string;
 };
 
+export type CodeListData = {
+  title: string;
+  data?: CodeList;
+  hasError?: boolean;
+};
+
 export type CodeListPageProps = {
-  codeLists: CodeListWithMetadata[];
+  codeListsData: CodeListData[];
   onUpdateCodeListId: (codeListId: string, newCodeListId: string) => void;
   onUpdateCodeList: (updatedCodeList: CodeListWithMetadata) => void;
   onUploadCodeList: (uploadedCodeList: File) => void;
-  fetchDataError: boolean;
 };
+
 export function CodeListPage({
-  codeLists,
+  codeListsData,
   onUpdateCodeListId,
   onUpdateCodeList,
   onUploadCodeList,
-  fetchDataError,
 }: CodeListPageProps): React.ReactElement {
   const { t } = useTranslation();
   const [codeListInEditMode, setCodeListInEditMode] = useState<string>(undefined);
 
-  if (fetchDataError)
-    return <StudioPageError message={t('app_content_library.code_lists.fetch_error')} />;
-
-  const codeListTitles = ArrayUtils.mapByKey<CodeListWithMetadata, 'title'>(codeLists, 'title');
+  const codeListTitles = ArrayUtils.mapByKey<CodeListData, 'title'>(codeListsData, 'title');
 
   const handleUploadCodeList = (uploadedCodeList: File) => {
     setCodeListInEditMode(FileNameUtils.removeExtension(uploadedCodeList.name));
@@ -48,14 +50,14 @@ export function CodeListPage({
   return (
     <div className={classes.codeListsContainer}>
       <StudioHeading size='small'>{t('app_content_library.code_lists.page_name')}</StudioHeading>
-      <CodeListsCounterMessage codeListsCount={codeLists.length} />
+      <CodeListsCounterMessage codeListsCount={codeListsData.length} />
       <CodeListsActionsBar
         onUploadCodeList={handleUploadCodeList}
         onUpdateCodeList={onUpdateCodeList}
         codeListNames={codeListTitles}
       />
       <CodeLists
-        codeLists={codeLists}
+        codeListsData={codeListsData}
         onUpdateCodeListId={handleUpdateCodeListId}
         onUpdateCodeList={onUpdateCodeList}
         codeListInEditMode={codeListInEditMode}
diff --git a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.test.tsx b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.test.tsx
index 0b6db8e869e..ee1c20ecf03 100644
--- a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.test.tsx
+++ b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.test.tsx
@@ -8,12 +8,9 @@ import type { RenderResult } from '@testing-library/react';
 import type { UserEvent } from '@testing-library/user-event';
 import userEvent from '@testing-library/user-event';
 import type { CodeList as StudioComponentsCodeList } from '@studio/components';
+import { codeListsDataMock } from '../../../../../../mocks/mockPagesConfig';
 
-const codeListName = 'codeList';
-const codeListWithMetadataMock: CodeListWithMetadata = {
-  title: codeListName,
-  codeList: [{ value: 'value', label: 'label' }],
-};
+const codeListName = codeListsDataMock[0].title;
 const onUpdateCodeListIdMock = jest.fn();
 const onUpdateCodeListMock = jest.fn();
 
@@ -96,6 +93,12 @@ describe('CodeLists', () => {
     await changeCodeListId(user, codeListName, invalidCodeListName);
     expect(onUpdateCodeListIdMock).not.toHaveBeenCalled();
   });
+
+  it('renders error message if option list has error', () => {
+    renderCodeLists({ codeListsData: [{ ...codeListsDataMock[0], hasError: true, data: null }] });
+    const errorMessage = screen.getByText(textMock('app_content_library.code_lists.fetch_error'));
+    expect(errorMessage).toBeInTheDocument();
+  });
 });
 
 const changeCodeListId = async (user: UserEvent, oldCodeListId: string, newCodeListId: string) => {
@@ -116,7 +119,7 @@ const changeCodeListId = async (user: UserEvent, oldCodeListId: string, newCodeL
 };
 
 const defaultProps: CodeListsProps = {
-  codeLists: [codeListWithMetadataMock],
+  codeListsData: codeListsDataMock,
   onUpdateCodeListId: onUpdateCodeListIdMock,
   onUpdateCodeList: onUpdateCodeListMock,
   codeListInEditMode: undefined,
@@ -131,21 +134,24 @@ describe('updateCodeListWithMetadata', () => {
   it('returns an updated CodeListWithMetadata object', () => {
     const updatedCodeList: StudioComponentsCodeList = [{ value: '', label: '' }];
     const updatedCodeListWithMetadata: CodeListWithMetadata = updateCodeListWithMetadata(
-      codeListWithMetadataMock,
+      { title: codeListsDataMock[0].title, codeList: codeListsDataMock[0].data },
       updatedCodeList,
     );
-    expect(updatedCodeListWithMetadata).toEqual({ title: codeListName, codeList: updatedCodeList });
+    expect(updatedCodeListWithMetadata).toEqual({
+      title: codeListsDataMock[0].title,
+      codeList: updatedCodeList,
+    });
   });
 
   it('works with an empty code list', () => {
     const updatedCodeList: StudioComponentsCodeList = [];
     const updatedCodeListWithMetadata: CodeListWithMetadata = updateCodeListWithMetadata(
-      codeListWithMetadataMock,
+      { title: codeListsDataMock[0].title, codeList: codeListsDataMock[0].data },
       updatedCodeList,
     );
 
     expect(updatedCodeListWithMetadata).toEqual({
-      title: codeListName,
+      title: codeListsDataMock[0].title,
       codeList: updatedCodeList,
     });
   });
diff --git a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.tsx b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.tsx
index b1efeea2270..11afcfdd26e 100644
--- a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.tsx
+++ b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/CodeLists.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
-import type { CodeListWithMetadata } from '../CodeListPage';
+import type { CodeListData, CodeListWithMetadata } from '../CodeListPage';
 import { Accordion } from '@digdir/designsystemet-react';
-import type { CodeList as StudioComponentsCodeList } from '@studio/components';
+import { StudioAlert, type CodeList as StudioComponentsCodeList } from '@studio/components';
 import { EditCodeList } from './EditCodeList/EditCodeList';
 import { useTranslation } from 'react-i18next';
 
 export type CodeListsProps = {
-  codeLists: CodeListWithMetadata[];
+  codeListsData: CodeListData[];
   onUpdateCodeListId: (codeListId: string, newCodeListId: string) => void;
   onUpdateCodeList: (updatedCodeList: CodeListWithMetadata) => void;
   codeListInEditMode: string | undefined;
@@ -14,16 +14,16 @@ export type CodeListsProps = {
 };
 
 export function CodeLists({
-  codeLists,
+  codeListsData,
   onUpdateCodeListId,
   onUpdateCodeList,
   codeListInEditMode,
   codeListNames,
 }: CodeListsProps) {
-  return codeLists.map((codeList) => (
+  return codeListsData.map((codeListData) => (
     <CodeList
-      key={codeList.title}
-      codeList={codeList}
+      key={codeListData.title}
+      codeListData={codeListData}
       onUpdateCodeListId={onUpdateCodeListId}
       onUpdateCodeList={onUpdateCodeList}
       codeListInEditMode={codeListInEditMode}
@@ -32,16 +32,10 @@ export function CodeLists({
   ));
 }
 
-type CodeListProps = {
-  codeList: CodeListWithMetadata;
-  onUpdateCodeListId: (codeListId: string, newCodeListId: string) => void;
-  onUpdateCodeList: (updatedCodeList: CodeListWithMetadata) => void;
-  codeListInEditMode: string | undefined;
-  codeListNames: string[];
-};
+type CodeListProps = Omit<CodeListsProps, 'codeListsData'> & { codeListData: CodeListData };
 
 function CodeList({
-  codeList,
+  codeListData,
   onUpdateCodeListId,
   onUpdateCodeList,
   codeListInEditMode,
@@ -51,27 +45,54 @@ function CodeList({
 
   return (
     <Accordion border>
-      <Accordion.Item defaultOpen={codeListInEditMode === codeList.title}>
+      <Accordion.Item defaultOpen={codeListInEditMode === codeListData.title}>
         <Accordion.Header
           title={t('app_content_library.code_lists.code_list_accordion_title', {
-            codeListTitle: codeList.title,
+            codeListTitle: codeListData.title,
           })}
         >
-          {codeList.title}
+          {codeListData.title}
         </Accordion.Header>
-        <Accordion.Content>
-          <EditCodeList
-            codeList={codeList}
-            onUpdateCodeListId={onUpdateCodeListId}
-            onUpdateCodeList={onUpdateCodeList}
-            codeListNames={codeListNames}
-          />
-        </Accordion.Content>
+        <CodeListAccordionContent
+          codeListData={codeListData}
+          onUpdateCodeListId={onUpdateCodeListId}
+          onUpdateCodeList={onUpdateCodeList}
+          codeListNames={codeListNames}
+        />
       </Accordion.Item>
     </Accordion>
   );
 }
 
+type CodeListAccordionContentProps = Omit<CodeListProps, 'codeListInEditMode'>;
+
+function CodeListAccordionContent({
+  codeListData,
+  onUpdateCodeListId,
+  onUpdateCodeList,
+  codeListNames,
+}: CodeListAccordionContentProps): React.ReactElement {
+  const { t } = useTranslation();
+
+  return (
+    <Accordion.Content>
+      {codeListData.hasError ? (
+        <StudioAlert size='small' severity='danger'>
+          {t('app_content_library.code_lists.fetch_error')}
+        </StudioAlert>
+      ) : (
+        <EditCodeList
+          codeList={codeListData.data}
+          codeListTitle={codeListData.title}
+          onUpdateCodeListId={onUpdateCodeListId}
+          onUpdateCodeList={onUpdateCodeList}
+          codeListNames={codeListNames}
+        />
+      )}
+    </Accordion.Content>
+  );
+}
+
 export const updateCodeListWithMetadata = (
   currentCodeListWithMetadata: CodeListWithMetadata,
   updatedCodeList: StudioComponentsCodeList,
diff --git a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/EditCodeList/EditCodeList.tsx b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/EditCodeList/EditCodeList.tsx
index 717810e93c9..adee15ed216 100644
--- a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/EditCodeList/EditCodeList.tsx
+++ b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/CodeLists/EditCodeList/EditCodeList.tsx
@@ -11,7 +11,8 @@ import { useInputCodeListNameErrorMessage } from '../../hooks/useInputCodeListNa
 import classes from './EditCodeList.module.css';
 
 export type EditCodeListProps = {
-  codeList: CodeListWithMetadata;
+  codeList: CodeList;
+  codeListTitle: string;
   onUpdateCodeListId: (codeListId: string, newCodeListId: string) => void;
   onUpdateCodeList: (updatedCodeList: CodeListWithMetadata) => void;
   codeListNames: string[];
@@ -19,6 +20,7 @@ export type EditCodeListProps = {
 
 export function EditCodeList({
   codeList,
+  codeListTitle,
   onUpdateCodeListId,
   onUpdateCodeList,
   codeListNames,
@@ -28,16 +30,19 @@ export function EditCodeList({
   const getInvalidInputFileNameErrorMessage = useInputCodeListNameErrorMessage();
 
   const handleUpdateCodeListId = (newCodeListId: string) => {
-    if (newCodeListId !== codeList.title) onUpdateCodeListId(codeList.title, newCodeListId);
+    if (newCodeListId !== codeListTitle) onUpdateCodeListId(codeListTitle, newCodeListId);
   };
 
   const handleBlurAny = (updatedCodeList: CodeList): void => {
-    const updatedCodeListWithMetadata = updateCodeListWithMetadata(codeList, updatedCodeList);
+    const updatedCodeListWithMetadata = updateCodeListWithMetadata(
+      { title: codeListTitle, codeList: codeList },
+      updatedCodeList,
+    );
     onUpdateCodeList(updatedCodeListWithMetadata);
   };
 
   const handleValidateCodeListId = (newCodeListId: string) => {
-    const invalidCodeListNames = ArrayUtils.removeItemByValue(codeListNames, codeList.title);
+    const invalidCodeListNames = ArrayUtils.removeItemByValue(codeListNames, codeListTitle);
     const fileNameError = FileNameUtils.findFileNameError(newCodeListId, invalidCodeListNames);
     return getInvalidInputFileNameErrorMessage(fileNameError);
   };
@@ -50,26 +55,22 @@ export function EditCodeList({
           label: t('app_content_library.code_lists.code_list_edit_id_label'),
           icon: <KeyVerticalIcon />,
           title: t('app_content_library.code_lists.code_list_edit_id_title', {
-            codeListName: codeList.title,
+            codeListName: codeListTitle,
           }),
-          value: codeList.title,
+          value: codeListTitle,
           onBlur: (event) => handleUpdateCodeListId(event.target.value),
           size: 'small',
         }}
         viewProps={{
           label: t('app_content_library.code_lists.code_list_edit_id_label'),
-          children: codeList.title,
+          children: codeListTitle,
           variant: 'tertiary',
           title: t('app_content_library.code_lists.code_list_view_id_title', {
-            codeListName: codeList.title,
+            codeListName: codeListTitle,
           }),
         }}
       />
-      <StudioCodeListEditor
-        codeList={codeList.codeList}
-        onBlurAny={handleBlurAny}
-        texts={editorTexts}
-      />
+      <StudioCodeListEditor codeList={codeList} onBlurAny={handleBlurAny} texts={editorTexts} />
     </div>
   );
 }
diff --git a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/index.ts b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/index.ts
index 37eddf1ea3b..ffcb4126071 100644
--- a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/index.ts
+++ b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/CodeListPage/index.ts
@@ -1,2 +1,2 @@
 export { CodeListPage } from './CodeListPage';
-export type { CodeListWithMetadata, CodeListPageProps } from './CodeListPage';
+export type { CodeListWithMetadata, CodeListData, CodeListPageProps } from './CodeListPage';
diff --git a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/index.ts b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/index.ts
index 4066219e3f5..cedde4105d1 100644
--- a/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/index.ts
+++ b/frontend/libs/studio-content-library/src/ContentLibrary/LibraryBody/pages/index.ts
@@ -1 +1 @@
-export type { CodeListWithMetadata } from './CodeListPage';
+export type { CodeListWithMetadata, CodeListData } from './CodeListPage';
diff --git a/frontend/libs/studio-content-library/src/index.ts b/frontend/libs/studio-content-library/src/index.ts
index 7b2d6e43572..aa13dfd73a0 100644
--- a/frontend/libs/studio-content-library/src/index.ts
+++ b/frontend/libs/studio-content-library/src/index.ts
@@ -1,2 +1,2 @@
 export { ResourceContentLibraryImpl } from './config/ContentResourceLibraryImpl';
-export type { CodeListWithMetadata } from './ContentLibrary/LibraryBody/pages';
+export type { CodeListWithMetadata, CodeListData } from './ContentLibrary/LibraryBody/pages';
diff --git a/frontend/libs/studio-pure-functions/src/ObjectUtils/ObjectUtils.test.ts b/frontend/libs/studio-pure-functions/src/ObjectUtils/ObjectUtils.test.ts
index 9925795ee0b..a797b0cfbbb 100644
--- a/frontend/libs/studio-pure-functions/src/ObjectUtils/ObjectUtils.test.ts
+++ b/frontend/libs/studio-pure-functions/src/ObjectUtils/ObjectUtils.test.ts
@@ -81,32 +81,4 @@ describe('objectUtils', () => {
       expect(ObjectUtils.flattenObjectValues(object)).toEqual(['value1', 'value2', 'value3']);
     });
   });
-
-  describe('sortEntriesInObjectByKeys', () => {
-    it('Sorts all entries in an object by its keys', () => {
-      const unsortedObject = { b: 'value1', a: 'value2', c: 'value3' };
-      const sortedObject = ObjectUtils.sortEntriesInObjectByKeys(unsortedObject);
-      const sortedObjectKeys = Object.keys(sortedObject);
-      expect(sortedObjectKeys[0]).toBe('a');
-      expect(sortedObjectKeys[1]).toBe('b');
-      expect(sortedObjectKeys[2]).toBe('c');
-      expect(sortedObject).toEqual(unsortedObject);
-    });
-
-    it('Returns same order if entries in object is already sorted', () => {
-      const unsortedObject = { a: 'value1', b: 'value2', c: 'value3' };
-      const sortedObject = ObjectUtils.sortEntriesInObjectByKeys(unsortedObject);
-      const sortedObjectKeys = Object.keys(sortedObject);
-      expect(sortedObjectKeys[0]).toBe('a');
-      expect(sortedObjectKeys[1]).toBe('b');
-      expect(sortedObjectKeys[2]).toBe('c');
-      expect(sortedObject).toEqual(unsortedObject);
-    });
-
-    it('Returns empty list if entries to sort is empty', () => {
-      const emptyObject = {};
-      const sortedObject = ObjectUtils.sortEntriesInObjectByKeys(emptyObject);
-      expect(sortedObject).toEqual({});
-    });
-  });
 });
diff --git a/frontend/libs/studio-pure-functions/src/ObjectUtils/ObjectUtils.ts b/frontend/libs/studio-pure-functions/src/ObjectUtils/ObjectUtils.ts
index 9f15a9743de..e911317a8f5 100644
--- a/frontend/libs/studio-pure-functions/src/ObjectUtils/ObjectUtils.ts
+++ b/frontend/libs/studio-pure-functions/src/ObjectUtils/ObjectUtils.ts
@@ -44,14 +44,4 @@ export class ObjectUtils {
       })
       .flat();
   };
-
-  /**
-   * Sorts all entries in an object by its keys.
-   * @param object The object to sort.
-   * @returns A new object with the entries sorted by key.
-   */
-  static sortEntriesInObjectByKeys = <T extends object>(object: T): T =>
-    Object.fromEntries(
-      Object.entries(object).sort(([keyA], [keyB]) => keyA.localeCompare(keyB)),
-    ) as T;
 }
diff --git a/frontend/packages/shared/src/api/queries.ts b/frontend/packages/shared/src/api/queries.ts
index edf4d6f8926..af0fef14bd7 100644
--- a/frontend/packages/shared/src/api/queries.ts
+++ b/frontend/packages/shared/src/api/queries.ts
@@ -89,7 +89,7 @@ import type { Policy } from 'app-shared/types/Policy';
 import type { RepoDiffResponse } from 'app-shared/types/api/RepoDiffResponse';
 import type { ExternalImageUrlValidationResponse } from 'app-shared/types/api/ExternalImageUrlValidationResponse';
 import type { MaskinportenScopes } from 'app-shared/types/MaskinportenScope';
-import type { OptionsList, OptionsLists } from 'app-shared/types/api/OptionsLists';
+import type { OptionsList, OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
 import type { LayoutSetsModel } from '../types/api/dto/LayoutSetsModel';
 import type { AccessPackageResource, PolicyAccessPackageAreaGroup } from 'app-shared/types/PolicyAccessPackages';
 
@@ -117,7 +117,7 @@ export const getLayoutNames = (owner: string, app: string) => get<string[]>(layo
 export const getLayoutSets = (owner: string, app: string) => get<LayoutSets>(layoutSetsPath(owner, app));
 export const getLayoutSetsExtended = (owner: string, app: string) => get<LayoutSetsModel>(layoutSetsPath(owner, app) + '/extended');
 export const getOptionList = (owner: string, app: string, optionsListId: string) => get<OptionsList>(optionListPath(owner, app, optionsListId));
-export const getOptionLists = (owner: string, app: string) => get<OptionsLists>(optionListsPath(owner, app));
+export const getOptionLists = (owner: string, app: string) => get<OptionsListsResponse>(optionListsPath(owner, app));
 export const getOptionListIds = (owner: string, app: string) => get<string[]>(optionListIdsPath(owner, app));
 export const getOrgList = () => get<OrgList>(orgListUrl());
 export const getOrganizations = () => get<Organization[]>(orgsListPath());
diff --git a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListIdMutation.test.ts b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListIdMutation.test.ts
index fa78f914d6f..6b2b67a29a5 100644
--- a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListIdMutation.test.ts
+++ b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListIdMutation.test.ts
@@ -6,7 +6,7 @@ import { useUpdateOptionListIdMutation } from './useUpdateOptionListIdMutation';
 import { createQueryClientMock } from 'app-shared/mocks/queryClientMock';
 import { QueryKey } from 'app-shared/types/QueryKey';
 import type { Option } from 'app-shared/types/Option';
-import type { OptionsLists } from 'app-shared/types/api/OptionsLists';
+import type { OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
 
 // Test data:
 const optionListId: string = 'optionListId';
@@ -17,7 +17,7 @@ const args: UpdateOptionListIdMutationArgs = { optionListId, newOptionListId };
 describe('useUpdateOptionListIdMutation', () => {
   test('Calls useUpdateOptionIdList with correct parameters', async () => {
     const queryClient = createQueryClientMock();
-    queryClient.setQueryData([QueryKey.OptionLists, org, app], [{ optionListId: optionListMock }]);
+    queryClient.setQueryData([QueryKey.OptionLists, org, app], []);
     const renderUpdateOptionListMutationResult = renderHookWithProviders(
       () => useUpdateOptionListIdMutation(org, app),
       { queryClient },
@@ -38,11 +38,11 @@ describe('useUpdateOptionListIdMutation', () => {
     const optionListC = 'optionListC';
     const optionListZ = 'optionListZ';
     const queryClient = createQueryClientMock();
-    const oldData: OptionsLists = {
-      optionListA: optionListMock,
-      optionListB: optionListMock,
-      optionListZ: optionListMock,
-    };
+    const oldData: OptionsListsResponse = [
+      { title: optionListA, data: optionListMock },
+      { title: optionListB, data: optionListMock },
+      { title: optionListZ, data: optionListMock },
+    ];
     queryClient.setQueryData([QueryKey.OptionLists, org, app], oldData);
     const renderUpdateOptionListMutationResult = renderHookWithProviders(
       () => useUpdateOptionListIdMutation(org, app),
@@ -52,17 +52,25 @@ describe('useUpdateOptionListIdMutation', () => {
       optionListId: optionListA,
       newOptionListId: optionListC,
     });
-    const cacheData = queryClient.getQueryData([QueryKey.OptionLists, org, app]);
-    const cacheDataKeys = Object.keys(cacheData);
-    expect(cacheDataKeys[0]).toEqual(optionListB);
-    expect(cacheDataKeys[1]).toEqual(optionListC);
-    expect(cacheDataKeys[2]).toEqual(optionListZ);
+    const cacheData: OptionsListsResponse = queryClient.getQueryData([
+      QueryKey.OptionLists,
+      org,
+      app,
+    ]);
+    expect(cacheData[0].title).toEqual(optionListB);
+    expect(cacheData[1].title).toEqual(optionListC);
+    expect(cacheData[2].title).toEqual(optionListZ);
   });
 
   test('Invalidates the optionListIds query cache', async () => {
     const queryClient = createQueryClientMock();
     const invalidateQueriesSpy = jest.spyOn(queryClient, 'invalidateQueries');
-    queryClient.setQueryData([QueryKey.OptionLists, org, app], []);
+    const oldData: OptionsListsResponse = [
+      { title: 'firstOptionList', data: optionListMock },
+      { title: 'optionListId', data: optionListMock },
+      { title: 'lastOptionList', data: optionListMock },
+    ];
+    queryClient.setQueryData([QueryKey.OptionLists, org, app], oldData);
     const renderUpdateOptionListMutationResult = renderHookWithProviders(
       () => useUpdateOptionListIdMutation(org, app),
       { queryClient },
diff --git a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListIdMutation.ts b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListIdMutation.ts
index 6c5804e284d..253cc4f7233 100644
--- a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListIdMutation.ts
+++ b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListIdMutation.ts
@@ -1,8 +1,8 @@
 import { QueryKey } from 'app-shared/types/QueryKey';
-import type { OptionsLists } from 'app-shared/types/api/OptionsLists';
+import type { OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
 import { useQueryClient, useMutation } from '@tanstack/react-query';
 import { useServicesContext } from 'app-shared/contexts/ServicesContext';
-import { ObjectUtils } from '@studio/pure-functions';
+import { ArrayUtils } from '@studio/pure-functions';
 
 export interface UpdateOptionListIdMutationArgs {
   optionListId: string;
@@ -21,7 +21,11 @@ export const useUpdateOptionListIdMutation = (org: string, app: string) => {
       }));
     },
     onSuccess: ({ optionListId, newOptionListId }) => {
-      const oldData: OptionsLists = queryClient.getQueryData([QueryKey.OptionLists, org, app]);
+      const oldData: OptionsListsResponse = queryClient.getQueryData([
+        QueryKey.OptionLists,
+        org,
+        app,
+      ]);
       const ascSortedData = changeIdAndSortCacheData(optionListId, newOptionListId, oldData);
       queryClient.setQueryData([QueryKey.OptionLists, org, app], ascSortedData);
       // Currently we only need to remove the old and not set the new, since mutating the Id only happens from the library which uses the large OptionLists cache
@@ -34,10 +38,13 @@ export const useUpdateOptionListIdMutation = (org: string, app: string) => {
 const changeIdAndSortCacheData = (
   oldId: string,
   newId: string,
-  oldData: OptionsLists,
-): OptionsLists => {
-  const newData = { ...oldData };
-  delete newData[oldId];
-  newData[newId] = oldData[oldId];
-  return ObjectUtils.sortEntriesInObjectByKeys(newData);
+  oldData: OptionsListsResponse,
+): OptionsListsResponse => {
+  const oldOptionList = oldData.find((optionList) => optionList.title === oldId);
+  const newOptionLists: OptionsListsResponse = ArrayUtils.replaceByPredicate(
+    oldData,
+    (optionList) => optionList.title === oldId,
+    { ...oldOptionList, title: newId },
+  );
+  return newOptionLists.sort((a, b) => a.title.localeCompare(b.title));
 };
diff --git a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.test.ts b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.test.ts
index 851ef6b6461..11e38199955 100644
--- a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.test.ts
+++ b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.test.ts
@@ -27,16 +27,23 @@ describe('useUpdateOptionListMutation', () => {
     expect(queriesMock.updateOptionList).toHaveBeenCalledWith(org, app, optionListId, optionsList);
   });
 
-  test('Sets the updated option list on the cache for all option lists', async () => {
+  test('Sets the updated option list on the cache for all option lists when cache contains the list', async () => {
     const queryClient = createQueryClientMock();
+    queryClient.setQueryData(
+      [QueryKey.OptionLists, org, app],
+      [{ title: optionListId, data: optionsList }],
+    );
     const renderUpdateOptionListMutationResult = renderHookWithProviders(
       () => useUpdateOptionListMutation(org, app),
       { queries: { updateOptionList }, queryClient },
     ).result;
     await renderUpdateOptionListMutationResult.current.mutateAsync(args);
-    expect(queryClient.getQueryData([QueryKey.OptionLists, org, app])).toEqual({
-      test: updatedOptionsList,
-    });
+    expect(queryClient.getQueryData([QueryKey.OptionLists, org, app])).toEqual([
+      {
+        title: optionListId,
+        data: updatedOptionsList,
+      },
+    ]);
   });
 
   test('Sets the updated option list on the cache for the single option list', async () => {
diff --git a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.ts b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.ts
index 2f885ffe0f6..3ae772dd54c 100644
--- a/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.ts
+++ b/frontend/packages/shared/src/hooks/mutations/useUpdateOptionListMutation.ts
@@ -1,9 +1,14 @@
 import type { MutationMeta } from '@tanstack/react-query';
 import { QueryKey } from 'app-shared/types/QueryKey';
 import type { Option } from 'app-shared/types/Option';
-import type { OptionsLists } from 'app-shared/types/api/OptionsLists';
+import type {
+  OptionsList,
+  OptionsListData,
+  OptionsListsResponse,
+} from 'app-shared/types/api/OptionsLists';
 import { useQueryClient, useMutation } from '@tanstack/react-query';
 import { useServicesContext } from 'app-shared/contexts/ServicesContext';
+import { ArrayUtils } from '@studio/pure-functions';
 
 export interface UpdateOptionListMutationArgs {
   optionListId: string;
@@ -19,12 +24,34 @@ export const useUpdateOptionListMutation = (org: string, app: string, meta?: Mut
       return updateOptionList(org, app, optionListId, optionsList);
     },
     onSuccess: (updatedOptionList: Option[], { optionListId }) => {
-      const oldData: OptionsLists = queryClient.getQueryData([QueryKey.OptionLists, org, app]);
-      const newData = { ...oldData };
-      newData[optionListId] = updatedOptionList;
-      queryClient.setQueryData([QueryKey.OptionLists, org, app], newData);
+      const oldData: OptionsListsResponse = queryClient.getQueryData([
+        QueryKey.OptionLists,
+        org,
+        app,
+      ]);
+      if (isOptionsListInOptionListsCache(oldData)) {
+        const newData = updateListInOptionListsData(optionListId, updatedOptionList, oldData);
+        queryClient.setQueryData([QueryKey.OptionLists, org, app], newData);
+      }
       queryClient.setQueryData([QueryKey.OptionList, org, app, optionListId], updatedOptionList);
+      void queryClient.invalidateQueries({ queryKey: [QueryKey.OptionListIds, org, app] });
     },
     meta,
   });
 };
+
+const isOptionsListInOptionListsCache = (data: OptionsListsResponse | null): boolean => !!data;
+
+const updateListInOptionListsData = (
+  optionListId: string,
+  updatedOptionList: OptionsList,
+  oldData: OptionsListsResponse,
+): OptionsListsResponse => {
+  const oldOptionsListData: OptionsListData = oldData.find(
+    (optionListData) => optionListData.title === optionListId,
+  );
+  return ArrayUtils.replaceByPredicate(oldData, (optionList) => optionList.title === optionListId, {
+    ...oldOptionsListData,
+    data: updatedOptionList,
+  });
+};
diff --git a/frontend/packages/shared/src/hooks/queries/useOptionListsQuery.ts b/frontend/packages/shared/src/hooks/queries/useOptionListsQuery.ts
index d378391aedf..9123f432848 100644
--- a/frontend/packages/shared/src/hooks/queries/useOptionListsQuery.ts
+++ b/frontend/packages/shared/src/hooks/queries/useOptionListsQuery.ts
@@ -2,12 +2,15 @@ import { useServicesContext } from 'app-shared/contexts/ServicesContext';
 import { QueryKey } from 'app-shared/types/QueryKey';
 import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
-import type { OptionsLists } from 'app-shared/types/api/OptionsLists';
+import type { OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
 
-export const useOptionListsQuery = (org: string, app: string): UseQueryResult<OptionsLists> => {
+export const useOptionListsQuery = (
+  org: string,
+  app: string,
+): UseQueryResult<OptionsListsResponse> => {
   const { getOptionLists } = useServicesContext();
-  return useQuery<OptionsLists>({
+  return useQuery<OptionsListsResponse>({
     queryKey: [QueryKey.OptionLists, org, app],
-    queryFn: () => getOptionLists(org, app).then((result) => result),
+    queryFn: () => getOptionLists(org, app),
   });
 };
diff --git a/frontend/packages/shared/src/mocks/queriesMock.ts b/frontend/packages/shared/src/mocks/queriesMock.ts
index 90b47697222..ce0e2f1faa7 100644
--- a/frontend/packages/shared/src/mocks/queriesMock.ts
+++ b/frontend/packages/shared/src/mocks/queriesMock.ts
@@ -69,7 +69,7 @@ import type { DeploymentsResponse } from 'app-shared/types/api/DeploymentsRespon
 import type { RepoDiffResponse } from 'app-shared/types/api/RepoDiffResponse';
 import type { ExternalImageUrlValidationResponse } from 'app-shared/types/api/ExternalImageUrlValidationResponse';
 import type { MaskinportenScope } from 'app-shared/types/MaskinportenScope';
-import type { OptionsList, OptionsLists } from 'app-shared/types/api/OptionsLists';
+import type { OptionsList, OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
 import type { LayoutSetsModel } from '../types/api/dto/LayoutSetsModel';
 import { layoutSetsExtendedMock } from '@altinn/ux-editor/testing/layoutSetsMock';
 
@@ -109,7 +109,7 @@ export const queriesMock: ServicesContextProps = {
     .mockImplementation(() => Promise.resolve<LayoutSetsModel>(layoutSetsExtendedMock)),
   getOptionListIds: jest.fn().mockImplementation(() => Promise.resolve<string[]>([])),
   getOptionList: jest.fn().mockImplementation(() => Promise.resolve<OptionsList>([])),
-  getOptionLists: jest.fn().mockImplementation(() => Promise.resolve<OptionsLists>({})),
+  getOptionLists: jest.fn().mockImplementation(() => Promise.resolve<OptionsListsResponse>([])),
   getOrgList: jest.fn().mockImplementation(() => Promise.resolve<OrgList>(orgList)),
   getOrganizations: jest.fn().mockImplementation(() => Promise.resolve<Organization[]>([])),
   getRepoMetadata: jest.fn().mockImplementation(() => Promise.resolve<Repository>(repository)),
diff --git a/frontend/packages/shared/src/types/api/OptionsLists.ts b/frontend/packages/shared/src/types/api/OptionsLists.ts
index 35b59e98882..4552a783d1f 100644
--- a/frontend/packages/shared/src/types/api/OptionsLists.ts
+++ b/frontend/packages/shared/src/types/api/OptionsLists.ts
@@ -2,4 +2,10 @@ import type { Option } from 'app-shared/types/Option';
 
 export type OptionsList = Option[];
 
-export type OptionsLists = Record<string, OptionsList>;
+export type OptionsListData = {
+  title: string;
+  data?: OptionsList;
+  hasError?: boolean;
+};
+
+export type OptionsListsResponse = OptionsListData[];
diff --git a/frontend/packages/ux-editor/src/components/Elements/ExportForm.tsx b/frontend/packages/ux-editor/src/components/Elements/ExportForm.tsx
index 41ac3c4756e..78a789d8e2b 100644
--- a/frontend/packages/ux-editor/src/components/Elements/ExportForm.tsx
+++ b/frontend/packages/ux-editor/src/components/Elements/ExportForm.tsx
@@ -14,7 +14,7 @@ export const ExportForm = () => {
   const { org, app } = useStudioEnvironmentParams();
   const { selectedFormLayoutSetName } = useAppContext();
   const { data: formLayouts } = useFormLayoutsQuery(org, app, selectedFormLayoutSetName);
-  const { data: optionLists } = useOptionListsQuery(org, app);
+  const { data: optionListsData } = useOptionListsQuery(org, app);
 
   const { data: textResources } = useTextResourcesQuery(org, app);
   const { data: settings } = useFormLayoutSettingsQuery(org, app, selectedFormLayoutSetName);
@@ -27,11 +27,11 @@ export const ExportForm = () => {
         selectedFormLayoutSetName,
         app,
         textResources,
-        optionLists,
+        optionListsData,
         'nb',
         false,
       ),
-    [formLayouts, textResources, settings, selectedFormLayoutSetName, app, optionLists],
+    [formLayouts, textResources, settings, selectedFormLayoutSetName, app, optionListsData],
   );
 
   const [exportFormat, setExportFormat] = React.useState<ExportFormType>({
diff --git a/frontend/packages/ux-editor/src/utils/exportUtils.test.ts b/frontend/packages/ux-editor/src/utils/exportUtils.test.ts
index 4664f25c808..521582460ad 100644
--- a/frontend/packages/ux-editor/src/utils/exportUtils.test.ts
+++ b/frontend/packages/ux-editor/src/utils/exportUtils.test.ts
@@ -5,6 +5,7 @@ import type { ITextResources } from 'app-shared/types/global';
 import type { ExportForm } from '../types/ExportForm';
 import type { FormComponent } from '../types/FormComponent';
 import type { FormContainer } from '../types/FormContainer';
+import type { OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
 
 describe('generateExportFormFormat', () => {
   const settings = {
@@ -101,9 +102,10 @@ describe('generateExportFormFormat', () => {
       },
     ],
   };
-  const optionLists = {
-    optionList1: [{ label: 'option1', value: 'option1' }],
-  };
+  const optionListsData: OptionsListsResponse = [
+    { title: 'optionList1', data: [{ label: 'option1', value: 'option1' }] },
+  ];
+
   it.each(['nb', 'en'])(
     'should generate correct export format for specified default language',
     (language) => {
@@ -113,7 +115,7 @@ describe('generateExportFormFormat', () => {
         selectedFormLayoutSetName,
         app,
         textResources,
-        optionLists,
+        optionListsData,
         language,
         false,
       );
@@ -198,7 +200,7 @@ describe('generateExportFormFormat', () => {
       selectedFormLayoutSetName,
       app,
       textResources,
-      optionLists,
+      optionListsData,
       undefined,
       false,
     );
@@ -250,7 +252,7 @@ describe('generateExportFormFormat', () => {
       selectedFormLayoutSetName,
       app,
       textResources,
-      optionLists,
+      optionListsData,
       'nb',
       false,
     );
@@ -269,7 +271,7 @@ describe('generateExportFormFormat', () => {
       selectedFormLayoutSetName,
       app,
       textResources,
-      optionLists,
+      optionListsData,
       'nb',
       true,
     );
@@ -281,7 +283,7 @@ describe('generateExportFormFormat', () => {
     expect(result.pages[0].components[1]).toHaveProperty('mapping');
   });
 
-  it('should return empty array for text resorce binding if no text resource bindings are set for component', () => {
+  it('should return empty array for text resource binding if no text resource bindings are set for component', () => {
     const componentWithoutTextResourceBindings: FormComponent<ComponentType.Input> = {
       id: 'component1',
       itemType: 'COMPONENT',
@@ -297,7 +299,7 @@ describe('generateExportFormFormat', () => {
       selectedFormLayoutSetName,
       app,
       textResources,
-      optionLists,
+      optionListsData,
       'nb',
       true,
     );
diff --git a/frontend/packages/ux-editor/src/utils/exportUtils.ts b/frontend/packages/ux-editor/src/utils/exportUtils.ts
index a0036212848..07e99122233 100644
--- a/frontend/packages/ux-editor/src/utils/exportUtils.ts
+++ b/frontend/packages/ux-editor/src/utils/exportUtils.ts
@@ -8,9 +8,9 @@ import type {
   ExportTextResourceValue,
 } from '../types/ExportForm';
 import type { IFormLayouts, IOption, ITextResourceBindings } from '../types/global';
-import type { KeyValuePairs } from 'app-shared/types/KeyValuePairs';
 import { internalLayoutToExternal } from '../converters/formLayoutConverters';
 import type { ExternalComponent, ExternalFormLayout } from 'app-shared/types/api';
+import type { OptionsListsResponse } from 'app-shared/types/api/OptionsLists';
 
 export class ExportUtils {
   private readonly pageOrder: string[];
@@ -18,7 +18,7 @@ export class ExportUtils {
   private readonly layoutSetName: string;
   private readonly appId: string;
   private readonly textResources: ITextResources;
-  private readonly optionLists: KeyValuePairs<any>;
+  private readonly optionListsData: OptionsListsResponse;
   private readonly defaultLanguage: string;
   private readonly includeRestProperties: boolean;
 
@@ -28,7 +28,7 @@ export class ExportUtils {
     layoutSetName: string,
     appId: string,
     textResources: ITextResources,
-    optionLists: KeyValuePairs<any>,
+    optionListsData: OptionsListsResponse,
     defaultLanguage: string,
     includeRestProperties: boolean = false,
   ) {
@@ -37,7 +37,7 @@ export class ExportUtils {
     this.layoutSetName = layoutSetName;
     this.appId = appId;
     this.textResources = textResources;
-    this.optionLists = optionLists;
+    this.optionListsData = optionListsData;
     this.defaultLanguage = defaultLanguage;
     this.includeRestProperties = includeRestProperties;
   }
@@ -141,7 +141,10 @@ export class ExportUtils {
       return component.options;
     }
     if (component.optionsId) {
-      return this.optionLists[component.optionsId];
+      const optionListData = this.optionListsData.find(
+        (optionListData) => optionListData.title === component.optionsId,
+      );
+      return optionListData.data;
     }
     return undefined;
   };