diff --git a/src/config/staging-mainnet.js b/src/config/staging-mainnet.js
index 5b795118..559b1ece 100644
--- a/src/config/staging-mainnet.js
+++ b/src/config/staging-mainnet.js
@@ -4,7 +4,7 @@ import { TX_SERVICE_HOST, RELAY_API_URL } from '~/config/names'
 
 const stagingMainnetConfig = {
   ...stagingConfig,
-  [TX_SERVICE_HOST]: 'https://safe-transaction.mainnet.gnosis.io/api/v1/',
+  [TX_SERVICE_HOST]: 'https://safe-transaction.mainnet.staging.gnosisdev.com/api/v1/',
   [RELAY_API_URL]: 'https://safe-relay.gnosis.io/api/v1/',
 }
 
diff --git a/src/config/staging.js b/src/config/staging.js
index 8677760d..b871411c 100644
--- a/src/config/staging.js
+++ b/src/config/staging.js
@@ -2,7 +2,7 @@
 import { TX_SERVICE_HOST, SIGNATURES_VIA_METAMASK, RELAY_API_URL } from '~/config/names'
 
 const stagingConfig = {
-  [TX_SERVICE_HOST]: 'https://safe-transaction.rinkeby.gnosis.io/api/v1/',
+  [TX_SERVICE_HOST]: 'https://safe-transaction.staging.gnosisdev.com/api/v1/',
   [SIGNATURES_VIA_METAMASK]: false,
   [RELAY_API_URL]: 'https://safe-relay.staging.gnosisdev.com/api/v1/',
 }
diff --git a/src/routes/safe/store/actions/createTransaction.js b/src/routes/safe/store/actions/createTransaction.js
index ee8df66c..04ff30d1 100644
--- a/src/routes/safe/store/actions/createTransaction.js
+++ b/src/routes/safe/store/actions/createTransaction.js
@@ -72,12 +72,6 @@ const createTransaction = (
         closeSnackbar(beforeExecutionKey)
 
         pendingExecutionKey = showSnackbar(notificationsQueue.pendingExecution, enqueueSnackbar, closeSnackbar)
-      })
-      .on('error', (error) => {
-        console.error('Tx error: ', error)
-      })
-      .then(async (receipt) => {
-        closeSnackbar(pendingExecutionKey)
 
         try {
           await saveTxToHistory(
@@ -94,6 +88,12 @@ const createTransaction = (
         } catch (err) {
           console.error(err)
         }
+      })
+      .on('error', (error) => {
+        console.error('Tx error: ', error)
+      })
+      .then((receipt) => {
+        closeSnackbar(pendingExecutionKey)
 
         showSnackbar(
           isExecution
diff --git a/src/routes/safe/store/actions/processTransaction.js b/src/routes/safe/store/actions/processTransaction.js
index 3e73e24f..e3425387 100644
--- a/src/routes/safe/store/actions/processTransaction.js
+++ b/src/routes/safe/store/actions/processTransaction.js
@@ -103,17 +103,11 @@ const processTransaction = (
 
     await transaction
       .send(sendParams)
-      .once('transactionHash', (hash) => {
+      .once('transactionHash', async (hash) => {
         txHash = hash
         closeSnackbar(beforeExecutionKey)
 
         pendingExecutionKey = showSnackbar(notificationsQueue.pendingExecution, enqueueSnackbar, closeSnackbar)
-      })
-      .on('error', (error) => {
-        console.error('Processing transaction error: ', error)
-      })
-      .then(async (receipt) => {
-        closeSnackbar(pendingExecutionKey)
 
         try {
           await saveTxToHistory(
@@ -130,6 +124,12 @@ const processTransaction = (
         } catch (err) {
           console.error(err)
         }
+      })
+      .on('error', (error) => {
+        console.error('Processing transaction error: ', error)
+      })
+      .then((receipt) => {
+        closeSnackbar(pendingExecutionKey)
 
         showSnackbar(
           shouldExecute