diff --git a/app/store/index.js b/app/store/index.js
index 556b8914c66..a491924e856 100644
--- a/app/store/index.js
+++ b/app/store/index.js
@@ -50,6 +50,7 @@ const persistConfig = {
 	storage: MigratedStorage,
 	stateReconciler: autoMergeLevel2, // see "Merge Process" section for details.
 	migrate: createMigrate(migrations, { debug: false }),
+	timeout: 30000,
 	writeFailHandler: error => Logger.error(error, { message: 'Error persisting data' }) // Log error if saving state fails
 };
 
diff --git a/app/util/transactions/index.js b/app/util/transactions/index.js
index 084cc132919..fce4885e5e9 100644
--- a/app/util/transactions/index.js
+++ b/app/util/transactions/index.js
@@ -31,6 +31,7 @@ import {
 } from '../confirm-tx';
 
 import humanizeDuration from 'humanize-duration';
+import Logger from '../../util/Logger';
 
 const { SAI_ADDRESS } = AppConstants;
 
@@ -653,7 +654,7 @@ export const calculateEIP1559Times = ({
 			timeEstimateId = AppConstants.GAS_TIMES.RANGE;
 		}
 	} catch (error) {
-		console.log('ERROR ESTIMATING TIME', error);
+		Logger.log('ERROR ESTIMATING TIME', error);
 	}
 
 	return { timeEstimate, timeEstimateColor, timeEstimateId };