diff --git a/packages/faucet/src/actions/start/start.ts b/packages/faucet/src/actions/start/start.ts
index 43789c4b..4b5303ab 100644
--- a/packages/faucet/src/actions/start/start.ts
+++ b/packages/faucet/src/actions/start/start.ts
@@ -57,13 +57,13 @@ export async function start(args: ReadonlyArray<string>): Promise<void> {
   const chainTokens = await tokenTickersOfFirstChain(signer);
   console.info("Chain tokens:", chainTokens);
 
-  const accounts = await accountsOfFirstChain(profile, signer);
+  const accounts = await accountsOfFirstChain(profile, connection);
   logAccountsState(accounts);
 
   let availableTokens = availableTokensFromHolder(accounts[0]);
   console.info("Available tokens:", availableTokens);
   setInterval(async () => {
-    const updatedAccounts = await accountsOfFirstChain(profile, signer);
+    const updatedAccounts = await accountsOfFirstChain(profile, connection);
     availableTokens = availableTokensFromHolder(updatedAccounts[0]);
     console.info("Available tokens:", availableTokens);
   }, 60_000);
@@ -90,7 +90,7 @@ export async function start(args: ReadonlyArray<string>): Promise<void> {
           "See https://github.com/iov-one/iov-faucet for all further information.\n";
         break;
       case "/status": {
-        const updatedAccounts = await accountsOfFirstChain(profile, signer);
+        const updatedAccounts = await accountsOfFirstChain(profile, connection);
         context.response.body = {
           status: "ok",
           nodeUrl: blockchainBaseUrl,
diff --git a/packages/faucet/src/multichainhelpers.ts b/packages/faucet/src/multichainhelpers.ts
index cedcac8d..42b7898c 100644
--- a/packages/faucet/src/multichainhelpers.ts
+++ b/packages/faucet/src/multichainhelpers.ts
@@ -26,15 +26,15 @@ export function identitiesOfFirstWallet(profile: UserProfile): ReadonlyArray<Ide
 
 export async function accountsOfFirstChain(
   profile: UserProfile,
-  signer: MultiChainSigner,
+  connection: BlockchainConnection,
 ): Promise<ReadonlyArray<Account>> {
-  const addresses = identitiesOfFirstWallet(profile).map(identity => signer.identityToAddress(identity));
-  const chainId = signer.chainIds()[0];
+  const codec = codecImplementation();
+  const addresses = identitiesOfFirstWallet(profile).map(identity => codec.identityToAddress(identity));
 
   // tslint:disable-next-line: readonly-array
   const out: Account[] = [];
   for (const address of addresses) {
-    const response = await signer.connection(chainId).getAccount({ address: address });
+    const response = await connection.getAccount({ address: address });
     if (response) {
       out.push({
         address: response.address,
@@ -101,7 +101,7 @@ export async function refillFirstChain(profile: UserProfile, signer: MultiChainS
 
   const holderIdentity = identitiesOfFirstWallet(profile)[0];
 
-  const accounts = await accountsOfFirstChain(profile, signer);
+  const accounts = await accountsOfFirstChain(profile, connection);
   logAccountsState(accounts);
   const holderAccount = accounts[0];
   const distributorAccounts = accounts.slice(1);
@@ -135,7 +135,7 @@ export async function refillFirstChain(profile: UserProfile, signer: MultiChainS
     }
 
     console.info("Done refilling accounts.");
-    logAccountsState(await accountsOfFirstChain(profile, signer));
+    logAccountsState(await accountsOfFirstChain(profile, connection));
   } else {
     console.info("Nothing to be done. Anyways, thanks for checking.");
   }