diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d420a3..398a290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 ### Fixed
 
+- do not show login note if it is not set
 - typo in dropdown options https://github.com/ohmyform/ohmyform/issues/96
 
 ### Security
diff --git a/pages/login/index.tsx b/pages/login/index.tsx
index 320c068..bd5f2f2 100644
--- a/pages/login/index.tsx
+++ b/pages/login/index.tsx
@@ -76,7 +76,7 @@ const Index: NextPage = () => {
           }}
         />
 
-        {data && (
+        {data && data.loginNote && (
           <Alert
             type="warning"
             showIcon