diff --git a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
index 401843f8ca4ac4c6ef48114d839ee502bb02e8ea..be5d6aaeaeb9096b05b45a2f3dc62678b0c7271f 100644
--- a/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
+++ b/src/components/ContainerComponents/WelcomeModalContainer/WelcomeModalContainer.tsx
@@ -16,6 +16,7 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
   client,
 }: WelcomeModalContainerProps) => {
   const [modalOpen, setModalOpen] = useState<boolean>(false)
+  const [modalExist, setModalExist] = useState<boolean>(false)
 
   const { data: instanceSettings } = useInstanceSettings(client)
   async function updateWelcomeModalState() {
@@ -42,13 +43,19 @@ const WelcomeModalContainer: React.FC<WelcomeModalContainerProps> = ({
         .then(async ({ data }) => {
           const welcomeModalState = data[0].haveSeenWelcomeModal
           if (!welcomeModalState) {
-            setModalOpen(true)
+            setModalExist(true)
           }
         })
     }
     getWelcomeModalState()
   }, [])
 
+  useEffect(() => {
+    if (modalExist) {
+      setModalOpen(true)
+    }
+  }, [modalExist])
+
   return (
     <React.Fragment>
       <Modal