diff --git a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt
index 92be6426b4..fc65ca28a9 100644
--- a/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt
+++ b/app/src/main/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapper.kt
@@ -33,7 +33,7 @@ private fun GeckoProductAnalysis.toProductReview(): ProductReviewState =
             ProductReviewState.Error.GenericError
         }
     } else {
-        val mappedRating = adjustedRating.toFloatOrNull()
+        val mappedRating = adjustedRating?.toFloatOrNull()
         val mappedGrade = grade?.toGrade()
         val mappedHighlights = highlights?.toHighlights()?.toSortedMap()
 
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/ProductAnalysisTestData.kt b/app/src/test/java/org/mozilla/fenix/shopping/ProductAnalysisTestData.kt
index d2804b0678..da684e69bb 100644
--- a/app/src/test/java/org/mozilla/fenix/shopping/ProductAnalysisTestData.kt
+++ b/app/src/test/java/org/mozilla/fenix/shopping/ProductAnalysisTestData.kt
@@ -16,7 +16,7 @@ object ProductAnalysisTestData {
         productId: String? = "1",
         analysisURL: String = "https://test.com",
         grade: String? = "A",
-        adjustedRating: Double = 4.5,
+        adjustedRating: Double? = 4.5,
         needsAnalysis: Boolean = false,
         lastAnalysisTime: Long = 0L,
         deletedProductReported: Boolean = false,
diff --git a/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt b/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt
index da83a0259e..504d04abfe 100644
--- a/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/shopping/middleware/ProductAnalysisMapperTest.kt
@@ -141,7 +141,7 @@ class ProductAnalysisMapperTest {
         val actual =
             ProductAnalysisTestData.productAnalysis(
                 grade = null,
-                adjustedRating = 0.0,
+                adjustedRating = null,
                 highlights = null,
             ).toProductReviewState()
         val expected = ReviewQualityCheckState.OptedIn.ProductReviewState.NoAnalysisPresent()