diff --git a/firebase-common/CHANGELOG.md b/firebase-common/CHANGELOG.md
index ed9082936bd..b16178ee1cd 100644
--- a/firebase-common/CHANGELOG.md
+++ b/firebase-common/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+- [fixed] Resolved a thread deadlock in HeartBeatInfoStorage when using Jetpack DataStore background executors.(#8182)
+
 # 22.0.1
 
 - [changed] Improve datastore support (#7277)
diff --git a/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorage.java b/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorage.java
index d998729c69d..7f5484e0d77 100644
--- a/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorage.java
+++ b/firebase-common/src/main/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorage.java
@@ -128,7 +128,7 @@ synchronized List<HeartBeatResult> getAllHeartBeats() {
     return heartBeatResults;
   }
 
-  private synchronized Preferences.Key<Set<String>> getStoredUserAgentString(
+  private Preferences.Key<Set<String>> getStoredUserAgentString(
       MutablePreferences preferences, String dateString) {
     for (Map.Entry<Preferences.Key<?>, Object> entry : preferences.asMap().entrySet()) {
       if (entry.getValue() instanceof Set) {
@@ -143,7 +143,7 @@ private synchronized Preferences.Key<Set<String>> getStoredUserAgentString(
     return null;
   }
 
-  private synchronized void updateStoredUserAgent(
+  private void updateStoredUserAgent(
       MutablePreferences preferences, Preferences.Key<Set<String>> userAgent, String dateString) {
     removeStoredDate(preferences, dateString);
     Set<String> userAgentDateSet =
@@ -152,7 +152,7 @@ private synchronized void updateStoredUserAgent(
     preferences.set(userAgent, userAgentDateSet);
   }
 
-  private synchronized void removeStoredDate(MutablePreferences preferences, String dateString) {
+  private void removeStoredDate(MutablePreferences preferences, String dateString) {
     // Find stored heartbeat and clear it.
     Preferences.Key<Set<String>> userAgent = getStoredUserAgentString(preferences, dateString);
     if (userAgent == null) {
@@ -179,7 +179,7 @@ synchronized void postHeartBeatCleanUp() {
         });
   }
 
-  private synchronized String getFormattedDate(long millis) {
+  private String getFormattedDate(long millis) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       Instant instant = new Date(millis).toInstant();
       LocalDateTime ldt = instant.atOffset(ZoneOffset.UTC).toLocalDateTime();
@@ -226,7 +226,7 @@ synchronized void storeHeartBeat(long millis, String userAgentString) {
         });
   }
 
-  private synchronized long cleanUpStoredHeartBeats(MutablePreferences preferences) {
+  private long cleanUpStoredHeartBeats(MutablePreferences preferences) {
     long heartBeatCount = JavaDataStorageKt.getOrDefault(preferences, HEART_BEAT_COUNT_TAG, 0L);
 
     String lowestDate = null;
@@ -264,7 +264,7 @@ synchronized void updateGlobalHeartBeat(long millis) {
         });
   }
 
-  synchronized boolean isSameDateUtc(long base, long target) {
+  boolean isSameDateUtc(long base, long target) {
     return getFormattedDate(base).equals(getFormattedDate(target));
   }
 
diff --git a/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageKotlinTest.kt b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageKotlinTest.kt
new file mode 100644
index 00000000000..705dea4bb80
--- /dev/null
+++ b/firebase-common/src/test/java/com/google/firebase/heartbeatinfo/HeartBeatInfoStorageKotlinTest.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2026 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.firebase.heartbeatinfo
+
+import androidx.datastore.preferences.core.MutablePreferences
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import com.google.firebase.datastorage.JavaDataStorage
+import java.util.Collections
+import java.util.concurrent.CompletableFuture
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.any
+import org.mockito.Mockito.doAnswer
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.`when`
+
+@RunWith(AndroidJUnit4::class)
+class HeartBeatInfoStorageKotlinTest {
+
+  /**
+   * Regression test for https://github.com/firebase/firebase-android-sdk/issues/8016
+   *
+   * <p>Root Cause: The synchronized storeHeartBeat() method locks the HeartBeatInfoStorage instance
+   * while waiting for JavaDataStorage.editSync(...) to complete. However, editSync schedules its
+   * preference updates on a different background thread. If helper methods called inside the
+   * editSync transaction block (such as getStoredUserAgentString, updateStoredUserAgent, or
+   * cleanUpStoredHeartBeats) are also marked as synchronized, the background thread blocks trying
+   * to acquire the HeartBeatInfoStorage lock, which is held by the caller thread waiting for the
+   * background thread to complete, causing a permanent deadlock.
+   *
+   * <p>Fix: Removed the synchronized keyword from helper methods (and isSameDateUtc) since they
+   * operate exclusively on thread-local transaction parameters and do not access shared mutable
+   * instance state.
+   */
+  @Test
+  fun storeHeartBeat_whenCalledOnSeparateThread_doesNotDeadlock() {
+    val mockDataStore = mock(JavaDataStorage::class.java)
+    val heartBeatStorageWithMock = HeartBeatInfoStorage(mockDataStore)
+
+    // Mock editSync to run the transform on a background thread and block the caller thread
+    doAnswer { invocation ->
+        @Suppress("UNCHECKED_CAST")
+        val transform = invocation.getArgument<(MutablePreferences) -> Unit>(0)
+
+        val future =
+          CompletableFuture.runAsync {
+            val mockPrefs = mock(MutablePreferences::class.java)
+            // Mock get(LAST_STORED_DATE) to return the target date to force entry into the if block
+            `when`(mockPrefs.get(stringPreferencesKey("last-used-date"))).thenReturn("1970-01-01")
+            // Mock asMap() to avoid NullPointerException
+            `when`(mockPrefs.asMap()).thenReturn(Collections.emptyMap())
+
+            transform(mockPrefs)
+          }
+
+        future.get() // Blocks the caller thread
+        mock(Preferences::class.java)
+      }
+      .`when`(mockDataStore)
+      .editSync(anyTransform())
+
+    // Spawn a thread to call storeHeartBeat, which would deadlock under the bug
+    val thread = Thread {
+      heartBeatStorageWithMock.storeHeartBeat(0L, "test-agent") // 1970-01-01
+    }
+
+    thread.start()
+    thread.join(3000) // Wait 3 seconds
+
+    try {
+      // Since the bug is fixed, the thread should not be alive.
+      assertThat(thread.isAlive).isFalse()
+    } finally {
+      thread.interrupt()
+    }
+  }
+
+  private fun anyTransform(): (MutablePreferences) -> Unit {
+    any<kotlin.jvm.functions.Function1<MutablePreferences, kotlin.Unit>>()
+    return { _: MutablePreferences -> }
+  }
+}