diff --git a/src/renderer/entities/transaction/lib/transactionBuilder.ts b/src/renderer/entities/transaction/lib/transactionBuilder.ts
index d1f124398b..6b4ba53cae 100644
--- a/src/renderer/entities/transaction/lib/transactionBuilder.ts
+++ b/src/renderer/entities/transaction/lib/transactionBuilder.ts
@@ -329,6 +329,7 @@ type EditDelegationParams = {
   undelegateTracks: number[];
   target: Address;
   conviction: Conviction;
+  previousConviction: Conviction;
   balance: string;
 };
 
@@ -339,6 +340,7 @@ function buildEditDelegation({
   undelegateTracks,
   target,
   conviction,
+  previousConviction,
   balance,
 }: EditDelegationParams): Transaction {
   const undelegateTxs = undelegateTracks.map((track) => ({
@@ -358,6 +360,7 @@ function buildEditDelegation({
       track,
       target,
       conviction,
+      previousConviction,
       balance,
     },
   }));
diff --git a/src/renderer/pages/Basket/lib/prepareTransactions.ts b/src/renderer/pages/Basket/lib/prepareTransactions.ts
index f6a4d39b26..3922865cf1 100644
--- a/src/renderer/pages/Basket/lib/prepareTransactions.ts
+++ b/src/renderer/pages/Basket/lib/prepareTransactions.ts
@@ -577,8 +577,9 @@ async function prepareEditDelegationTransaction({ transaction, wallets, chains,
 
     shards: [account!],
     balance: coreTxs[0].args.balance,
-    conviction: votingService.getConviction(coreTxs[0].args.conviction),
-    previousConviction: 'None',
+    conviction: coreTxs[0].args.conviction,
+    // TODO: Previous conviction should be received from chain
+    previousConviction: coreTxs[0].args.previousConviction || 'None',
     target: coreTxs[0].args.target,
     tracks: coreTxs.map((t: Transaction) => t.args.track),
     description: '',
diff --git a/src/renderer/widgets/EditDelegationModal/model/edit-delegation-model.ts b/src/renderer/widgets/EditDelegationModal/model/edit-delegation-model.ts
index 3fa92d88dd..260668be34 100644
--- a/src/renderer/widgets/EditDelegationModal/model/edit-delegation-model.ts
+++ b/src/renderer/widgets/EditDelegationModal/model/edit-delegation-model.ts
@@ -218,6 +218,7 @@ sample({
         accountId: shard.accountId,
         balance: amount || '0',
         conviction: conviction || 'None',
+        previousConviction: activeDelegations[address].conviction || 'None',
         target: target?.accountId || '',
         tracks,
         undelegateTracks: