diff --git a/src/config/development.js b/src/config/development.js
index b1630ac8..969a0a99 100644
--- a/src/config/development.js
+++ b/src/config/development.js
@@ -10,7 +10,7 @@ const devConfig = {
   [TX_SERVICE_HOST]: 'http://localhost:8000/api/v1/',
   [ENABLED_TX_SERVICE_MODULES]: false,
   [ENABLED_TX_SERVICE_REMOVAL_SENDER]: false,
-  [SIGNATURES_VIA_METAMASK]: true,
+  [SIGNATURES_VIA_METAMASK]: false,
 }
 
 export default devConfig
diff --git a/src/config/production.js b/src/config/production.js
index 92ef00d6..7666dc14 100644
--- a/src/config/production.js
+++ b/src/config/production.js
@@ -10,7 +10,7 @@ const prodConfig = {
   [TX_SERVICE_HOST]: 'https://safe-transaction-history.dev.gnosisdev.com/api/v1/',
   [ENABLED_TX_SERVICE_MODULES]: false,
   [ENABLED_TX_SERVICE_REMOVAL_SENDER]: false,
-  [SIGNATURES_VIA_METAMASK]: true,
+  [SIGNATURES_VIA_METAMASK]: false,
 }
 
 export default prodConfig
diff --git a/src/config/testing.js b/src/config/testing.js
index 9aba3dba..ef5d23be 100644
--- a/src/config/testing.js
+++ b/src/config/testing.js
@@ -10,7 +10,7 @@ const testConfig = {
   [TX_SERVICE_HOST]: 'http://localhost:8000/api/v1/',
   [ENABLED_TX_SERVICE_MODULES]: false,
   [ENABLED_TX_SERVICE_REMOVAL_SENDER]: false,
-  [SIGNATURES_VIA_METAMASK]: true,
+  [SIGNATURES_VIA_METAMASK]: false,
 }
 
 export default testConfig
diff --git a/src/test/safe.redux.transactions.test.js b/src/test/safe.redux.transactions.test.js
index b33bb241..cde151fb 100644
--- a/src/test/safe.redux.transactions.test.js
+++ b/src/test/safe.redux.transactions.test.js
@@ -12,6 +12,7 @@ import { promisify } from '~/utils/promisify'
 import { getWeb3 } from '~/logic/wallets/getWeb3'
 import { safeTransactionsSelector } from '~/routes/safe/store/selectors'
 import fetchSafe from '~/routes/safe/store/actions/fetchSafe'
+import { signaturesViaMetamask } from '~/config'
 import { testTransactionFrom, testSizeOfTransactions } from './utils/historyServiceHelper'
 
 
@@ -34,7 +35,7 @@ describe('Transactions Suite', () => {
     const gnosisSafe = await getSafeEthereumInstance(safeAddress)
     const firstTxData = gnosisSafe.contract.addOwnerWithThreshold.getData(accounts[1], 2)
     const executor = accounts[0]
-    const nonce = Date.now()
+    const nonce = signaturesViaMetamask() ? await gnosisSafe.nonce() : Date.now()
     const firstTxHash = await createTransaction(safe, 'Add Owner Second account', safeAddress, 0, nonce, executor, firstTxData)
     await store.dispatch(fetchSafe(safe))
     safe = getSafeFrom(store.getState(), safeAddress)