diff --git a/packages/apps/src/overlays/Attest.tsx b/packages/apps/src/overlays/Attest.tsx
index 51130aa7203f..abacf1471f83 100644
--- a/packages/apps/src/overlays/Attest.tsx
+++ b/packages/apps/src/overlays/Attest.tsx
@@ -6,6 +6,7 @@ import React from 'react';
 import { useApi, useAccounts, useCall } from '@polkadot/react-hooks';
 import { Option } from '@polkadot/types';
 import { EthereumAddress } from '@polkadot/types/interfaces';
+
 import { Link } from 'react-router-dom';
 
 import { useTranslation } from '../translate';
@@ -24,7 +25,7 @@ function Attest ({ className }: Props): React.ReactElement<Props> | null {
   // - already preclaimed,
   // - didn't sign the attest yet.
   // `claims.preclaims` returns Some() for these accounts.
-  const needAttest = useCall<[Option<EthereumAddress>]>(api.query.claims?.preclaims.multi, [allAccounts])?.filter((opt) => opt.isSome);
+  const needAttest = useCall<[Option<EthereumAddress>]>(api.query?.claims?.preclaims?.multi, [allAccounts])?.filter((opt) => opt.isSome);
 
   if (!needAttest?.length) {
     return null;
diff --git a/packages/page-claims/src/index.tsx b/packages/page-claims/src/index.tsx
index 21b9a314b8fb..7b3334afe091 100644
--- a/packages/page-claims/src/index.tsx
+++ b/packages/page-claims/src/index.tsx
@@ -11,7 +11,6 @@ import React, { useState, useCallback, useEffect } from 'react';
 import { Trans } from 'react-i18next';
 import styled from 'styled-components';
 import CopyToClipboard from 'react-copy-to-clipboard';
-import { withApi, withMulti } from '@polkadot/react-api/hoc';
 import { Button, Card, Columar, Column, InputAddress, Tooltip } from '@polkadot/react-components';
 import { TokenUnit } from '@polkadot/react-components/InputNumber';
 import { u8aToHex, u8aToString } from '@polkadot/util';
@@ -20,7 +19,7 @@ import { decodeAddress } from '@polkadot/util-crypto';
 import AttestDisplay from './Attest';
 import ClaimDisplay from './Claim';
 import { recoverFromJSON } from './util';
-import translate, { useTranslation } from './translate';
+import { useTranslation } from './translate';
 
 import { useApi, useCall } from '@polkadot/react-hooks';
 
@@ -218,8 +217,4 @@ const ClaimsApp = (props: Props): React.ReactElement => {
   );
 };
 
-export default withMulti(
-  ClaimsApp,
-  translate,
-  withApi
-);
+export default ClaimsApp;