diff --git a/CHANGELOG.md b/CHANGELOG.md
index abae8cf8e..13cfe377b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## v.NEXT
 
+**Bug fixes**
+
+* Actually wait for transaction receipt in Token contract deployment. This fixes issues with real-life environments like testnets or mainnet (`@colony/colony-js-client`)
 
 ## v1.5.0
 
diff --git a/packages/colony-js-client/src/ColonyNetworkClient/index.js b/packages/colony-js-client/src/ColonyNetworkClient/index.js
index 5e341c755..a5d08aea0 100644
--- a/packages/colony-js-client/src/ColonyNetworkClient/index.js
+++ b/packages/colony-js-client/src/ColonyNetworkClient/index.js
@@ -242,6 +242,10 @@ export default class ColonyNetworkClient extends ContractClient {
       [utf8ToHex(name), utf8ToHex(symbol), decimals],
     );
     const { hash } = await this.adapter.wallet.sendTransaction(transaction);
+    const receipt = await this.adapter.getTransactionReceipt(hash);
+    if (receipt != null) return receipt.contractAddress;
+
+    await this.adapter.waitForTransaction(hash);
     const { contractAddress } = await this.adapter.getTransactionReceipt(hash);
     return contractAddress;
   }