diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js
index 45957885f3a..16d5292bcb4 100644
--- a/src/js/controllers/walletHome.js
+++ b/src/js/controllers/walletHome.js
@@ -681,7 +681,6 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
       });
 
     var fc = profileService.focusedClient;
-    if (!fc) return;
     // ToDo: use a credential's (or fc's) function for this
     this.hideNote = !fc.credentials.sharedEncryptingKey;
   };
@@ -1146,6 +1145,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
   /* Start setup */
 
   this.bindTouchDown();
-  this.setAddress();
-  this.setSendFormInputs();
+  if (profileService.focusedClient) {
+    this.setAddress();
+    this.setSendFormInputs();
+  }
 });