diff --git a/src/Pages/Store/Calendar/index.js b/src/Pages/Store/Calendar/index.js
index 366ca08..eca451c 100644
--- a/src/Pages/Store/Calendar/index.js
+++ b/src/Pages/Store/Calendar/index.js
@@ -493,8 +493,10 @@ function CardPersonalCalendarSettings({ settings }) {
               />
 
               {settings.google_account_name !== undefined &&
+              settings.google_account_name !== null &&
               settings.google_account_name !== "" &&
               settings.google_account_picture !== undefined &&
+              settings.google_account_picture !== null &&
               settings.google_account_picture !== "" ? (
                 <Tooltip
                   title={t(