diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
index dda87dd28..897129f64 100644
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
@@ -43,15 +43,12 @@ object PaletteUtils {
 
     @JvmStatic
     fun getColor(context: Context, paletteColor: Int): Int {
-        var paletteColor = paletteColor
-
-        val res = StyledResources(context)
-        val palette = res.palette
-        if (paletteColor < 0 || paletteColor >= palette.size) {
+        val palette = StyledResources(context).palette
+        return if (paletteColor in palette.indices) {
+            palette[paletteColor]
+        } else {
             Log.w("ColorHelper", "Invalid color: $paletteColor. Returning default.")
-            paletteColor = 0
+            palette[0]
         }
-
-        return palette[paletteColor]
     }
 }