diff --git a/src/providers/MakerProvider.js b/src/providers/MakerProvider.js
index 7e64df492..7bf6cebd2 100644
--- a/src/providers/MakerProvider.js
+++ b/src/providers/MakerProvider.js
@@ -26,7 +26,8 @@ function MakerProvider({ children, network, testchainId, backendEnv }) {
       backendEnv
     }).then(maker => {
       setMaker(maker);
-      if (maker.currentAccount()) initAccount(maker.currentAccount());
+      if (maker.service('accounts').hasAccount())
+        initAccount(maker.currentAccount());
 
       maker.on('accounts/CHANGE', eventObj => {
         const { account } = eventObj.payload;