diff --git a/src/plugins/es_ui_shared/public/request/use_request.ts b/src/plugins/es_ui_shared/public/request/use_request.ts
index 33085bdbf4478..1241d6222a38f 100644
--- a/src/plugins/es_ui_shared/public/request/use_request.ts
+++ b/src/plugins/es_ui_shared/public/request/use_request.ts
@@ -103,8 +103,13 @@ export const useRequest = <D = any, E = Error>(
           : serializedResponseData;
         setData(responseData);
       }
-      // Setting isLoading to false also acts as a signal for scheduling the next poll request.
-      setIsLoading(false);
+      // There can be situations in which a component that consumes this hook gets unmounted when
+      // the request returns an error. So before changing the isLoading state, check if the component
+      // is still mounted.
+      if (isMounted.current === true) {
+        // Setting isLoading to false also acts as a signal for scheduling the next poll request.
+        setIsLoading(false);
+      }
     },
     [requestBody, httpClient, deserializer, clearPollInterval]
   );
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/step_progress.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/step_progress.tsx
index 2de21ad86f839..01b4fe4eb84fc 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/step_progress.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/reindex/flyout/step_progress.tsx
@@ -63,7 +63,7 @@ const Step: React.FunctionComponent<StepProgressStep & { idx: number }> = ({
     <Fragment>
       <div className="upgStepProgress__step">
         <StepStatus status={status} idx={idx} />
-        <p className={titleClassName}>{title}</p>
+        <div className={titleClassName}>{title}</div>
       </div>
       {children && <div className="upgStepProgress__content">{children}</div>}
     </Fragment>