diff --git a/x-pack/plugins/upgrade_assistant/common/types.ts b/x-pack/plugins/upgrade_assistant/common/types.ts
index 3032f48f75ee638..9752fa326082a2d 100644
--- a/x-pack/plugins/upgrade_assistant/common/types.ts
+++ b/x-pack/plugins/upgrade_assistant/common/types.ts
@@ -18,7 +18,9 @@ export type ClusterUpgradeState = 'isPreparingForUpgrade' | 'isUpgrading' | 'isU
 export interface ResponseError {
   statusCode: number;
   message: string | Error;
-  attributes?: Record<string, any>;
+  attributes?: {
+    allNodesUpgraded: boolean;
+  };
 }
 
 export enum ReindexStep {
diff --git a/x-pack/plugins/upgrade_assistant/public/application/app.tsx b/x-pack/plugins/upgrade_assistant/public/application/app.tsx
index c4bf0c95180076f..b31e82ef432d466 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/app.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/app.tsx
@@ -139,7 +139,6 @@ export const App = ({ history }: { history: ScopedHistory }) => {
         <EuiEmptyPrompt body={<EuiLoadingSpinner size="l" />} />
       </EuiPageContent>
     );
-    return;
   }
 
   return (
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/use_migrate_system_indices.ts b/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/use_migrate_system_indices.ts
index d6e9bd2a9d5ffe2..0d4ea9bfaf35ce4 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/use_migrate_system_indices.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/overview/migrate_system_indices/use_migrate_system_indices.ts
@@ -8,11 +8,11 @@
 import { useCallback, useState, useEffect } from 'react';
 import useInterval from 'react-use/lib/useInterval';
 
-import { SystemIndicesFlyout, SystemIndicesFlyoutProps } from './flyout';
-import { useAppContext } from '../../../app_context';
-import type { ResponseError } from '../../../lib/api';
-import { GlobalFlyout } from '../../../../shared_imports';
 import { SYSTEM_INDICES_MIGRATION_POLL_INTERVAL_MS } from '../../../../../common/constants';
+import type { ResponseError } from '../../../../../common/types';
+import { GlobalFlyout } from '../../../../shared_imports';
+import { useAppContext } from '../../../app_context';
+import { SystemIndicesFlyout, SystemIndicesFlyoutProps } from './flyout';
 
 const FLYOUT_ID = 'migrateSystemIndicesFlyout';
 const { useGlobalFlyout } = GlobalFlyout;