diff --git a/apps/deploy-web/src/components/home/YourAccount.tsx b/apps/deploy-web/src/components/home/YourAccount.tsx
index 813e4ce8a..54711f605 100644
--- a/apps/deploy-web/src/components/home/YourAccount.tsx
+++ b/apps/deploy-web/src/components/home/YourAccount.tsx
@@ -334,7 +334,7 @@ export const YourAccount: React.FunctionComponent<Props> = ({ balances, isLoadin
           </div>
         )}
 
-        {!address && <ConnectWallet text="Connect your wallet to deploy!" />}
+        {!address && <ConnectWallet text="Setup your billing to deploy!" />}
       </CardContent>
     </Card>
   );
diff --git a/apps/deploy-web/src/components/shared/PrerequisiteList.tsx b/apps/deploy-web/src/components/shared/PrerequisiteList.tsx
index c430ea858..d30d14e92 100644
--- a/apps/deploy-web/src/components/shared/PrerequisiteList.tsx
+++ b/apps/deploy-web/src/components/shared/PrerequisiteList.tsx
@@ -101,7 +101,7 @@ export const PrerequisiteList: React.FunctionComponent<Props> = ({ onClose, onCo
         </Card>
       ) : (
         <div className="py-8">
-          <ConnectWallet text="Connect your wallet to deploy!" />
+          <ConnectWallet text="Setup your billing to deploy!" />
         </div>
       )}
     </Popup>
diff --git a/apps/deploy-web/src/hooks/useAllowance.tsx b/apps/deploy-web/src/hooks/useAllowance.tsx
index 793bb2721..8d8ab81f3 100644
--- a/apps/deploy-web/src/hooks/useAllowance.tsx
+++ b/apps/deploy-web/src/hooks/useAllowance.tsx
@@ -25,7 +25,7 @@ const AllowanceNotificationMessage: FC = () => (
 );
 
 export const useAllowance = () => {
-  const { address } = useWallet();
+  const { address, isManaged } = useWallet();
   const [defaultFeeGranter, setDefaultFeeGranter] = useLocalStorage<string | undefined>(`default-fee-granters/${address}`, undefined);
   const { data: allFeeGranters, isLoading, isFetched } = useAllowancesGranted(address);
   const { enqueueSnackbar } = useSnackbar();
@@ -45,7 +45,7 @@ export const useAllowance = () => {
   }, [allFeeGranters, address]);
 
   useWhen(
-    isFetched && address,
+    isFetched && address && !isManaged,
     () => {
       const persistedAddresses = persisted[address] || [];
       const added = difference(actualAddresses, persistedAddresses);