diff --git a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
index f23cfc14c0..f488809bd2 100644
--- a/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
+++ b/src/pages/commonFeed/components/FeedLayout/FeedLayout.tsx
@@ -481,6 +481,10 @@ const FeedLayout: ForwardRefRenderFunction<FeedLayoutRef, FeedLayoutProps> = (
   ) => {
     const { commonId, messageId } = options;
 
+    if (chatItem?.feedItemId === feedItemId && !messageId) {
+      return;
+    }
+
     if (commonId && commonId !== outerCommon?.id) {
       history.push(
         getCommonPagePath(commonId, {
diff --git a/src/services/Api.ts b/src/services/Api.ts
index 9f49c6d660..e97a1713fe 100644
--- a/src/services/Api.ts
+++ b/src/services/Api.ts
@@ -37,7 +37,7 @@ const waitForAuthenticationToBeReady = async (): Promise<void> =>
 class Api {
   private createApiEngine = () => {
     const apiEngine = axios.create({
-      baseURL: config.cloudFunctionUrl,
+      baseURL: `${config.cloudFunctionUrl}/api`,
       timeout: AXIOS_TIMEOUT,
     });