diff --git a/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action_params_form.tsx b/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action_params_form.tsx
index af7ad511b061b..e14b73242d6d5 100644
--- a/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action_params_form.tsx
+++ b/x-pack/plugins/osquery/public/shared_components/lazy_osquery_action_params_form.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { EuiLoadingSpinner } from '@elastic/eui';
 import React, { lazy, Suspense } from 'react';
 import type { OsqueryResponseActionsParamsFormProps } from './osquery_response_action_type';
 
@@ -16,7 +17,7 @@ export const getLazyOsqueryResponseActionTypeForm =
     const { onError, defaultValues, onChange } = props;
 
     return (
-      <Suspense fallback={null}>
+      <Suspense fallback={<EuiLoadingSpinner />}>
         <OsqueryResponseActionParamsForm
           onChange={onChange}
           defaultValues={defaultValues}
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/osquery/osquery_response_action.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/osquery/osquery_response_action.tsx
index 9f9ad505ff332..69564861c748a 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/osquery/osquery_response_action.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/osquery/osquery_response_action.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useMemo } from 'react';
+import React from 'react';
 import { EuiCode, EuiEmptyPrompt } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useIsMounted } from '@kbn/securitysolution-hook-utils';
@@ -25,10 +25,6 @@ const GhostFormField = () => <></>;
 
 export const OsqueryResponseAction = React.memo((props: OsqueryResponseActionProps) => {
   const { osquery, application } = useKibana().services;
-  const OsqueryForm = useMemo(
-    () => osquery?.OsqueryResponseActionTypeForm,
-    [osquery?.OsqueryResponseActionTypeForm]
-  );
   const isMounted = useIsMounted();
 
   // serverless component that is returned when users do not have Endpoint.Complete tier
@@ -85,8 +81,7 @@ export const OsqueryResponseAction = React.memo((props: OsqueryResponseActionPro
       );
     }
 
-    // @ts-expect-error ts upgrade v4.7.4
-    if (isMounted() && OsqueryForm) {
+    if (isMounted()) {
       return (
         <UseField
           path={`${props.item.path}.params`}
diff --git a/x-pack/plugins/security_solution/public/management/components/page_overlay/page_overlay.tsx b/x-pack/plugins/security_solution/public/management/components/page_overlay/page_overlay.tsx
index e6f8f2b207ea8..77b39c9689a46 100644
--- a/x-pack/plugins/security_solution/public/management/components/page_overlay/page_overlay.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/page_overlay/page_overlay.tsx
@@ -253,8 +253,6 @@ export const PageOverlay = memo<PageOverlayProps>(
     useEffect(() => {
       if (
         isMounted() &&
-        // @ts-expect-error ts upgrade v4.7.4
-        onHide &&
         hideOnUrlPathnameChange &&
         !isHidden &&
         openedOnPathName &&
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/exception_operators_data_types/keyword_array.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/exception_operators_data_types/keyword_array.ts
index 7d95f6c9ec6bc..ff3611b4ab583 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/exception_operators_data_types/keyword_array.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group8/exception_operators_data_types/keyword_array.ts
@@ -154,8 +154,7 @@ export default ({ getService }: FtrProviderContext) => {
         await waitForSignalsToBePresent(supertest, log, 1, [id]);
         const signalsOpen = await getSignalsById(supertest, log, id);
         const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
-        // @ts-expect-error ts upgrade v4.7.4
-        expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+        expect(hits.flat(10)).to.eql([]);
       });
     });
 
@@ -283,7 +282,7 @@ export default ({ getService }: FtrProviderContext) => {
         await waitForSignalsToBePresent(supertest, log, 1, [id]);
         const signalsOpen = await getSignalsById(supertest, log, id);
         const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
-        expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+        expect(hits.flat(10)).to.eql([]);
       });
     });
 
@@ -345,7 +344,7 @@ export default ({ getService }: FtrProviderContext) => {
         await waitForSignalsToBePresent(supertest, log, 1, [id]);
         const signalsOpen = await getSignalsById(supertest, log, id);
         const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
-        expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+        expect(hits.flat(10)).to.eql([]);
       });
     });
 
@@ -525,7 +524,7 @@ export default ({ getService }: FtrProviderContext) => {
         await waitForSignalsToBePresent(supertest, log, 1, [id]);
         const signalsOpen = await getSignalsById(supertest, log, id);
         const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
-        expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+        expect(hits.flat(10)).to.eql([]);
       });
     });
 
@@ -695,7 +694,7 @@ export default ({ getService }: FtrProviderContext) => {
         await waitForSignalsToBePresent(supertest, log, 1, [id]);
         const signalsOpen = await getSignalsById(supertest, log, id);
         const hits = signalsOpen.hits.hits.map((hit) => hit._source?.keyword).sort();
-        expect(hits.flat(Number.MAX_SAFE_INTEGER)).to.eql([]);
+        expect(hits.flat(10)).to.eql([]);
       });
     });