diff --git a/.github/workflows/sample-distribution.yml b/.github/workflows/sample-distribution.yml
index 51bf53ca1c..9885602055 100644
--- a/.github/workflows/sample-distribution.yml
+++ b/.github/workflows/sample-distribution.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   build_and_deploy_ios_testflight_qa:
     name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/V5' }}
-    runs-on: [macos-14]
+    runs-on: [macos-15]
     steps:
       - name: Connect Bot
         uses: webfactory/ssh-agent@v0.7.0
@@ -25,7 +25,7 @@ jobs:
       - name: Install && Build - SDK and Sample App
         uses: ./.github/actions/install-and-build-sdk
       - name: Cache iOS pods
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: examples/SampleApp/ios/Pods
           key: ${{ runner.os }}-pods-${{ hashFiles('examples/SampleApp/ios/Podfile.lock') }}
@@ -33,7 +33,9 @@ jobs:
             ${{ runner.os }}-pods-
       - name: iOS Pods setup
         working-directory: examples/SampleApp/ios
-        run: bundle exec pod install
+        run: |
+          pod update hermes-engine --no-repo-update
+          bundle exec pod install
       - name: Build and release Testflight QA
         working-directory: examples/SampleApp
         run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/V5' }};
diff --git a/package/src/components/Channel/Channel.tsx b/package/src/components/Channel/Channel.tsx
index a2fecbec66..cdb2030f9b 100644
--- a/package/src/components/Channel/Channel.tsx
+++ b/package/src/components/Channel/Channel.tsx
@@ -203,7 +203,7 @@ export const reactionData: ReactionData[] = [
  * If count of unread messages is less than 4, then no need to scroll to first unread message,
  * since first unread message will be in visible frame anyways.
  */
-const scrollToFirstUnreadThreshold = 4;
+const scrollToFirstUnreadThreshold = 0;
 
 const defaultThrottleInterval = 500;
 const defaultDebounceInterval = 500;
@@ -1042,6 +1042,7 @@ const ChannelWithContext = <
       },
       () => {
         if (unreadMessageIdToScrollTo) {
+          setTargetedMessage(unreadMessageIdToScrollTo);
           restartSetsMergeFuncRef.current();
         }
       },