diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.kt
index f69ace1c6..68e8018aa 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/StackWidgetType.kt
@@ -27,14 +27,14 @@ enum class StackWidgetType(val value: Int) {
 
     companion object {
         fun getWidgetTypeFromValue(value: Int): StackWidgetType? {
-            return when {
-                CHECKMARK.value == value -> CHECKMARK
-                FREQUENCY.value == value -> FREQUENCY
-                SCORE.value == value -> SCORE
-                HISTORY.value == value -> HISTORY
-                STREAKS.value == value -> STREAKS
-                TARGET.value == value -> TARGET
-                else -> throw IllegalStateException()
+            return when (value) {
+                CHECKMARK.value -> CHECKMARK
+                FREQUENCY.value -> FREQUENCY
+                SCORE.value -> SCORE
+                HISTORY.value -> HISTORY
+                STREAKS.value -> STREAKS
+                TARGET.value -> TARGET
+                else -> null
             }
         }