diff --git a/src/plugins/safeSnap/components/Form/ConnextTransaction.vue b/src/plugins/safeSnap/components/Form/ConnextTransaction.vue
index cd49a1a896e..04e866b2345 100644
--- a/src/plugins/safeSnap/components/Form/ConnextTransaction.vue
+++ b/src/plugins/safeSnap/components/Form/ConnextTransaction.vue
@@ -15,7 +15,6 @@ import {
   getContractABI,
   contractInteractionToModuleTransaction,
   createBatch,
-  getNativeAsset
 } from '../../index';
 import { Network } from '../../constants';
 import SafeSnapTokensModal from './TokensModal.vue';
diff --git a/src/plugins/safeSnap/components/Form/TransferFunds.vue b/src/plugins/safeSnap/components/Form/TransferFunds.vue
index 6c54ad0725d..0d6935d29db 100644
--- a/src/plugins/safeSnap/components/Form/TransferFunds.vue
+++ b/src/plugins/safeSnap/components/Form/TransferFunds.vue
@@ -48,7 +48,6 @@ export default {
     modelValue(newModelValue) {
       if (this.isDetails && newModelValue) {
         this.to = newModelValue.recipient || '';
-        console.log('newModelValue.amount', newModelValue.amount);
         this.value = newModelValue.amount || '0';
         if (newModelValue.token) {
           this.tokenAddress = newModelValue.token.address;
diff --git a/src/plugins/safeSnap/components/HandleOutcomeUma.vue b/src/plugins/safeSnap/components/HandleOutcomeUma.vue
index 2bce428ae0c..a3a0cdbc50d 100644
--- a/src/plugins/safeSnap/components/HandleOutcomeUma.vue
+++ b/src/plugins/safeSnap/components/HandleOutcomeUma.vue
@@ -38,6 +38,7 @@ const props = defineProps<{
   network: Network;
   umaAddress: string;
   multiSendAddress: string;
+  gnosisSafeAddress: string;
 }>();
 
 const { formatDuration } = useIntl();
@@ -351,7 +352,7 @@ function extractConnextBatches(batches: Batch[], proposal: Proposal) {
             } else {
               transactions = [txOrGroup];
             }
-            
+
             transactions.forEach(tx => {
               if (
                 tx.nonce !== undefined &&
@@ -359,7 +360,8 @@ function extractConnextBatches(batches: Batch[], proposal: Proposal) {
               ) {
                 const newEntry = {
                   batchNonce: connextTransaction.nonce,
-                  gnosisSafeAddress: safe.gnosisSafeAddress
+                  gnosisSafeAddress:
+                    safe.gnosisSafeAddress ?? props.gnosisSafeAddress
                 };
 
                 // avoid duplicated
diff --git a/src/plugins/safeSnap/components/SafeTransactions.vue b/src/plugins/safeSnap/components/SafeTransactions.vue
index 4c4d9da55fc..3adab45c971 100644
--- a/src/plugins/safeSnap/components/SafeTransactions.vue
+++ b/src/plugins/safeSnap/components/SafeTransactions.vue
@@ -263,6 +263,7 @@ export default {
 
       if (!this.gnosisSafeAddress && dao) {
         this.transactionConfig.gnosisSafeAddress = dao;
+        this.gnosisSafeAddress = dao;
       }
 
       this.moduleType = moduleType;
@@ -444,6 +445,7 @@ export default {
             :proposal="proposal"
             :space="space"
             :results="results"
+            :gnosis-safe-address="transactionConfig.gnosisSafeAddress"
             :uma-address="transactionConfig.umaAddress"
             :multi-send-address="transactionConfig.multiSendAddress"
             :network="transactionConfig.network"