diff --git a/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeature.kt b/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeature.kt
index 09fee47ae..ef9b1cb69 100644
--- a/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeature.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeature.kt
@@ -110,7 +110,7 @@ class RecentSyncedTabFeature(
         lastSyncedTab: RecentSyncedTab?,
         syncStartId: GleanTimerId?
     ) {
-        RecentSyncedTabs.recentSyncedTabShown[tab.deviceType.name].add()
+        RecentSyncedTabs.recentSyncedTabShown[tab.deviceType.name.lowercase()].add()
         RecentSyncedTabs.recentSyncedTabTimeToLoad.stopAndAccumulate(syncStartId)
         if (tab == lastSyncedTab) {
             RecentSyncedTabs.latestSyncedTabIsStale.add()
diff --git a/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/controller/RecentSyncedTabController.kt b/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/controller/RecentSyncedTabController.kt
index 151f985b0..675a71c02 100644
--- a/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/controller/RecentSyncedTabController.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/recentsyncedtabs/controller/RecentSyncedTabController.kt
@@ -41,7 +41,7 @@ class DefaultRecentSyncedTabController(
     private val accessPoint: TabsTrayAccessPoint,
 ) : RecentSyncedTabController {
     override fun handleRecentSyncedTabClick(tab: RecentSyncedTab) {
-        RecentSyncedTabs.recentSyncedTabOpened[tab.deviceType.name].add()
+        RecentSyncedTabs.recentSyncedTabOpened[tab.deviceType.name.lowercase()].add()
         addNewTabUseCase.invoke(tab.url)
         navController.navigate(R.id.browserFragment)
     }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
index 49b6010e2..5ffe0d9c4 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
@@ -134,7 +134,7 @@ class TabsTrayFragment : AppCompatDialogFragment() {
 
         val args by navArgs<TabsTrayFragmentArgs>()
         args.accessPoint.takeIf { it != TabsTrayAccessPoint.None }?.let {
-            TabsTray.accessPoint[it.name].add()
+            TabsTray.accessPoint[it.name.lowercase()].add()
         }
         val initialMode = if (args.enterMultiselect) {
             TabsTrayState.Mode.Select(emptySet())
diff --git a/app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeatureTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeatureTest.kt
index fea0b60cc..2b044b41f 100644
--- a/app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeatureTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/RecentSyncedTabFeatureTest.kt
@@ -185,7 +185,7 @@ class RecentSyncedTabFeatureTest {
 
         feature.displaySyncedTabs(listOf(tab))
 
-        assertEquals(1, RecentSyncedTabs.recentSyncedTabShown[deviceAccessed1.deviceType.name].testGetValue())
+        assertEquals(1, RecentSyncedTabs.recentSyncedTabShown["desktop"].testGetValue())
     }
 
     @Test
diff --git a/app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/controller/DefaultRecentSyncedTabControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/controller/DefaultRecentSyncedTabControllerTest.kt
index 44bc47b60..7aec5de4f 100644
--- a/app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/controller/DefaultRecentSyncedTabControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/recentsyncedtabs/controller/DefaultRecentSyncedTabControllerTest.kt
@@ -102,7 +102,7 @@ class DefaultRecentSyncedTabControllerTest {
 
         controller.handleRecentSyncedTabClick(tab)
 
-        assertEquals(1, RecentSyncedTabs.recentSyncedTabOpened[deviceType.name].testGetValue())
+        assertEquals(1, RecentSyncedTabs.recentSyncedTabOpened["desktop"].testGetValue())
     }
 
     @Test