diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index 84281c109..c93a4a0be 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -172,6 +172,7 @@ function BillEnterModalContainer({
                 ],
             },
             refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID", "GET_JOB_BY_PK"],
+            awaitRefetchQueries: true
         });
 
         await Promise.all(
diff --git a/client/src/components/chat-affix/chat-affix.container.jsx b/client/src/components/chat-affix/chat-affix.container.jsx
index 5f252024e..d82115e72 100644
--- a/client/src/components/chat-affix/chat-affix.container.jsx
+++ b/client/src/components/chat-affix/chat-affix.container.jsx
@@ -32,6 +32,7 @@ export function ChatAffixContainer({bodyshop, chatVisible}) {
                     error
                 );
                 notification.open({
+                    key: 'fcm',
                     type: "warning",
                     message: t("general.errors.fcm"),
                     btn: (