diff --git a/frontend/app-development/features/processEditor/ProcessEditor.test.tsx b/frontend/app-development/features/processEditor/ProcessEditor.test.tsx
index 480b53d782d..cb94fa1a08c 100644
--- a/frontend/app-development/features/processEditor/ProcessEditor.test.tsx
+++ b/frontend/app-development/features/processEditor/ProcessEditor.test.tsx
@@ -32,13 +32,23 @@ describe('ProcessEditor', () => {
   });
 
   it('renders spinner when appLibVersion is not fetched', () => {
-    renderProcessEditor();
+    const queryClientMock = createQueryClientMock();
+    queryClientMock.setQueryData([QueryKey.AppMetadata, org, app], []);
+    renderProcessEditor({ queryClient: queryClientMock });
+    screen.getByText(textMock('process_editor.loading'));
+  });
+
+  it('renders spinner when appMetadata is not fetched', () => {
+    const queryClientMock = createQueryClientMock();
+    queryClientMock.setQueryData([QueryKey.AppVersion, org, app], defaultAppVersion);
+    renderProcessEditor({ queryClient: queryClientMock });
     screen.getByText(textMock('process_editor.loading'));
   });
 
   it('renders processEditor with "noBpmnFound" error message when appLibVersion is fetched but no bpmn is found', () => {
     const queryClientMock = createQueryClientMock();
     queryClientMock.setQueryData([QueryKey.AppVersion, org, app], defaultAppVersion);
+    queryClientMock.setQueryData([QueryKey.AppMetadata, org, app], []);
     renderProcessEditor({ queryClient: queryClientMock });
     screen.getByRole('heading', { name: textMock('process_editor.fetch_bpmn_error_title') });
   });
@@ -46,6 +56,7 @@ describe('ProcessEditor', () => {
   it('renders processEditor with "No task selected" message in config panel when appLibVersion is fetched but no bpmnDetails are found', () => {
     const queryClientMock = createQueryClientMock();
     queryClientMock.setQueryData([QueryKey.AppVersion, org, app], defaultAppVersion);
+    queryClientMock.setQueryData([QueryKey.AppMetadata, org, app], []);
     (useBpmnContext as jest.Mock).mockReturnValue({
       bpmnDetails: null,
     });
diff --git a/frontend/app-development/features/processEditor/ProcessEditor.tsx b/frontend/app-development/features/processEditor/ProcessEditor.tsx
index 3862c6cb3bc..691e01545c6 100644
--- a/frontend/app-development/features/processEditor/ProcessEditor.tsx
+++ b/frontend/app-development/features/processEditor/ProcessEditor.tsx
@@ -112,7 +112,7 @@ export const ProcessEditor = (): React.ReactElement => {
     onProcessTaskRemoveHandler.handleOnProcessTaskRemove(taskMetadata);
   };
 
-  if (appLibDataLoading) {
+  if (appLibDataLoading || appMetadataPending) {
     return <StudioPageSpinner spinnerTitle={t('process_editor.loading')} showSpinnerTitle />;
   }