diff --git a/packages/desktop-client/src/components/accounts/Account.js b/packages/desktop-client/src/components/accounts/Account.js
index d1e6f4a99e020f5bd4a0d6203449a28952730b7b..5349d15913fce5640c3c2b86120e3bc90b53ed82 100644
--- a/packages/desktop-client/src/components/accounts/Account.js
+++ b/packages/desktop-client/src/components/accounts/Account.js
@@ -720,7 +720,7 @@ const AccountHeader = React.memo(
                     {accountName}
                   </View>
 
-                  <NotesButton id={`account-${account.id}`} />
+                  {account && <NotesButton id={`account-${account.id}`} />}
                   <Button
                     bare
                     className="hover-visible"