diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
index c9b17db5532f4a..b4e5a344122123 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
@@ -36,6 +36,7 @@ Array [
       class="euiToolTipAnchor"
     >
       <button
+        aria-label="Click to copy fingerprint value"
         class="euiButtonIcon euiButtonIcon--primary"
         title="Click to copy fingerprint value"
         type="button"
@@ -82,6 +83,7 @@ Array [
       class="euiToolTipAnchor"
     >
       <button
+        aria-label="Click to copy fingerprint value"
         class="euiButtonIcon euiButtonIcon--primary"
         title="Click to copy fingerprint value"
         type="button"
diff --git a/x-pack/plugins/uptime/public/components/certificates/certificates_list.tsx b/x-pack/plugins/uptime/public/components/certificates/certificates_list.tsx
index 595aa03c99c730..a4c6e24f5de5e0 100644
--- a/x-pack/plugins/uptime/public/components/certificates/certificates_list.tsx
+++ b/x-pack/plugins/uptime/public/components/certificates/certificates_list.tsx
@@ -41,7 +41,7 @@ interface Props {
 }
 
 export const CertificateList: React.FC<Props> = ({ page, sort, onChange }) => {
-  const certificates = useSelector(certificatesSelector);
+  const { data: certificates, loading } = useSelector(certificatesSelector);
 
   const onTableChange = (newVal: Partial<Props>) => {
     onChange(newVal.page as Page, newVal.sort as CertSort);
@@ -98,6 +98,7 @@ export const CertificateList: React.FC<Props> = ({ page, sort, onChange }) => {
 
   return (
     <EuiBasicTable
+      loading={loading}
       columns={columns}
       items={certificates?.certs ?? []}
       pagination={pagination}
diff --git a/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx b/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx
index 41015739079246..04621b50a7af98 100644
--- a/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx
+++ b/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx
@@ -32,7 +32,14 @@ export const FingerprintCol: React.FC<Props> = ({ cert }) => {
           <EmptyButton>{text} </EmptyButton>
         </EuiToolTip>
         <EuiCopy textToCopy={val ?? ''}>
-          {copy => <EuiButtonIcon onClick={copy} iconType="copy" title={COPY_FINGERPRINT} />}
+          {copy => (
+            <EuiButtonIcon
+              aria-label={COPY_FINGERPRINT}
+              onClick={copy}
+              iconType="copy"
+              title={COPY_FINGERPRINT}
+            />
+          )}
         </EuiCopy>
       </Span>
     );
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
index 590a4b48c07d83..ae07cd8dddfb4a 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
@@ -193,10 +193,7 @@ export const MonitorListComponent: React.FC<Props> = ({
       <EuiBasicTable
         aria-label={labels.getDescriptionLabel(items.length)}
         error={error?.message}
-        // Only set loading to true when there are no items present to prevent the bug outlined in
-        // in https://github.com/elastic/eui/issues/2393 . Once that is fixed we can simply set the value here to
-        // loading={loading}
-        loading={loading && (!items || items.length < 1)}
+        loading={loading}
         isExpandable={true}
         hasActions={true}
         itemId="monitor_id"
diff --git a/x-pack/plugins/uptime/public/pages/certificates.tsx b/x-pack/plugins/uptime/public/pages/certificates.tsx
index 92a41adcf01cdf..a2b37657cf3fe0 100644
--- a/x-pack/plugins/uptime/public/pages/certificates.tsx
+++ b/x-pack/plugins/uptime/public/pages/certificates.tsx
@@ -72,7 +72,7 @@ export const CertificatesPage: React.FC = () => {
     );
   }, [dispatch, page, search, sort.direction, sort.field, lastRefresh]);
 
-  const certificates = useSelector(certificatesSelector);
+  const { data: certificates } = useSelector(certificatesSelector);
 
   return (
     <>
diff --git a/x-pack/plugins/uptime/public/state/certificates/certificates.ts b/x-pack/plugins/uptime/public/state/certificates/certificates.ts
index 18cbcf6bcb614b..81d2cec7d81f61 100644
--- a/x-pack/plugins/uptime/public/state/certificates/certificates.ts
+++ b/x-pack/plugins/uptime/public/state/certificates/certificates.ts
@@ -40,4 +40,4 @@ export function* fetchCertificatesEffect() {
   );
 }
 
-export const certificatesSelector = ({ certificates }: AppState) => certificates.certs.data;
+export const certificatesSelector = ({ certificates }: AppState) => certificates.certs;