diff --git a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
index dae75ee79225167822c7389288722a7974ad71a1..5f7941aa3545ac8a1921245540ca41b144b8b62f 100644
--- a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
+++ b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
@@ -15,10 +15,9 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
   t,
   client,
 }: WelcomeModalContainerProps) => {
-  const [modalOpen, setModalOpen] = useState<boolean>(true)
+  const [modalOpen, setModalOpen] = useState<boolean>(false)
 
   const { data: instanceSettings } = useInstanceSettings(client)
-
   async function updateWelcomeModalState() {
     await client
       .query(client.find(USERPROFILE_DOCTYPE).limitBy(1))
@@ -59,8 +58,11 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
           {t('COMMON.WELCOME_MODAL_TITLE')}
         </div>
         <div className="wm-name text-24-bold">
-          {instanceSettings.public_name} !
+          {instanceSettings.public_name
+            ? `${instanceSettings.public_name} !`
+            : null}
         </div>
+
         <div className="wm-perso text-18-bold">
           {t('COMMON.WELCOME_MODAL_PERSO')}
         </div>