diff --git a/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt b/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
index 7e63834..ca5fafe 100644
--- a/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
+++ b/src/com/android/customization/picker/color/data/repository/ColorPickerRepositoryImpl.kt
@@ -140,7 +140,9 @@
     override fun getCurrentColorOption(): ColorOptionModel {
         val overlays = colorManager.currentOverlays
         val styleOrNull = colorManager.currentStyle
-        val style = styleOrNull?.let { Style.valueOf(it) } ?: Style.TONAL_SPOT
+        val style = runCatching {
+            styleOrNull?.let { Style.valueOf(it) }
+        }.getOrNull() ?: Style.TONAL_SPOT
         val source = colorManager.currentColorSource
         val colorOptionBuilder = ColorOptionImpl.Builder()
         colorOptionBuilder.source = source