diff --git a/packages/nicolium/src/contexts/current-account-context.tsx b/packages/nicolium/src/contexts/current-account-context.tsx
index 043bfb76c..8eecfc4b0 100644
--- a/packages/nicolium/src/contexts/current-account-context.tsx
+++ b/packages/nicolium/src/contexts/current-account-context.tsx
@@ -31,7 +31,11 @@ const DefaultCurrentAccountProvider: React.FC<ICurrentAccountProvider> = ({ chil
   return <CurrentAccountContext.Provider value={value}>{children}</CurrentAccountContext.Provider>;
 };
 
-const useCurrentAccount = () => useContext(CurrentAccountContext)?.me || null;
+const useCurrentAccount = () => {
+  const context = useContext(CurrentAccountContext);
+
+  return context ? context.me : null;
+};
 
 const useCurrentAccountContext = () => useContext(CurrentAccountContext);