diff --git a/src/models/AzoriusTxBuilder.ts b/src/models/AzoriusTxBuilder.ts
index b4ddb411b..b777efcfe 100644
--- a/src/models/AzoriusTxBuilder.ts
+++ b/src/models/AzoriusTxBuilder.ts
@@ -88,8 +88,13 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
 
     if (daoData.votingStrategyType === VotingStrategyType.LINEAR_ERC20) {
       daoData = daoData as AzoriusERC20DAO;
-      if (daoData.isVotesToken) {
-        this.predictedTokenAddress = daoData.tokenImportAddress as Address;
+      if (!daoData.isTokenImported) {
+        this.setEncodedSetupTokenData();
+        this.setPredictedTokenAddress();
+      } else {
+        if (daoData.isVotesToken) {
+          this.predictedTokenAddress = daoData.tokenImportAddress as Address;
+        }
       }
     }
   }
diff --git a/src/models/DaoTxBuilder.ts b/src/models/DaoTxBuilder.ts
index eaf0c019f..f06917c8b 100644
--- a/src/models/DaoTxBuilder.ts
+++ b/src/models/DaoTxBuilder.ts
@@ -136,7 +136,7 @@ export class DaoTxBuilder extends BaseTxBuilder {
     ]);
 
     // build token if token is not imported
-    if (data.isVotesToken && data.votingStrategyType === VotingStrategyType.LINEAR_ERC20) {
+    if (!data.isTokenImported && data.votingStrategyType === VotingStrategyType.LINEAR_ERC20) {
       txs.push(azoriusTxBuilder.buildCreateTokenTx());
     }