diff --git a/app/src/client/app/PlayGroundPage.tsx b/app/src/client/app/PlayGroundPage.tsx
index f8f1b21d..c5dcbe7d 100644
--- a/app/src/client/app/PlayGroundPage.tsx
+++ b/app/src/client/app/PlayGroundPage.tsx
@@ -82,8 +82,19 @@ const PlayGroundPage = ({ user }: { user: User }) => {
   useEffect(() => {
     if (formSubmitMsg && currentChatDetails) {
       if (!currentChatDetails.userRespondedWithNextAction) {
-        const decodedMessage = decodeURIComponent(formSubmitMsg);
-        setTriggerChatFormSubmitMsg(decodedMessage);
+        try {
+          const decodedMessage = decodeURIComponent(formSubmitMsg);
+          setTriggerChatFormSubmitMsg(decodedMessage);
+        } catch (err: any) {
+          console.log('Error: ' + err.message);
+          setNotificationErrorMessage('There was an error processing your message. Please start a new chat.');
+          updateCurrentChat({
+            id: activeChatId,
+            data: {
+              isChatTerminated: true,
+            },
+          });
+        }
       }
       removeQueryParameters();
     }
@@ -198,9 +209,11 @@ const PlayGroundPage = ({ user }: { user: User }) => {
                 />
               </>
             ) : (
-              <div className='z-[999999] absolute inset-0 flex items-center justify-center bg-white bg-opacity-50'>
-                <Loader />
-              </div>
+              !currentChatDetails.isChatTerminated && (
+                <div className='z-[10000] absolute inset-0 flex items-center justify-center bg-white bg-opacity-50'>
+                  <Loader />
+                </div>
+              )
             )}
           </div>
         ) : (
diff --git a/app/src/client/components/NotificationBox.tsx b/app/src/client/components/NotificationBox.tsx
index 55f83d4e..412b6a4c 100644
--- a/app/src/client/components/NotificationBox.tsx
+++ b/app/src/client/components/NotificationBox.tsx
@@ -14,7 +14,7 @@ const NotificationBox: React.FC<NotificationBoxProps> = ({ type, message, onClic
   const isSuccess = type === 'success';
 
   return (
-    <div className='fixed inset-0 flex items-center justify-center z-50 p-16 backdrop-blur-sm bg-airt-font-base/30'>
+    <div className='fixed inset-0 flex items-center justify-center z-[10000] p-16 backdrop-blur-sm bg-airt-font-base/30'>
       <div className='bg-airt-primary rounded-lg shadow-lg p-8 m-4 max-w-sm mx-auto'>
         <h2 className='text-xl font-bold mb-4 text-airt-font-base'>{isSuccess ? 'Success' : 'Error'}</h2>
         <p className='text-airt-font-base'>{message}</p>