diff --git a/app/src/main/kotlin/org/fossify/clock/helpers/Converters.kt b/app/src/main/kotlin/org/fossify/clock/helpers/Converters.kt
index bbf7e2aa..afc3715d 100644
--- a/app/src/main/kotlin/org/fossify/clock/helpers/Converters.kt
+++ b/app/src/main/kotlin/org/fossify/clock/helpers/Converters.kt
@@ -8,7 +8,8 @@ import org.fossify.clock.models.TimerState
 class Converters {
 
     @TypeConverter
-    fun jsonToTimerState(value: String): TimerState {
+    fun jsonToTimerState(value: String?): TimerState {
+        if (value.isNullOrEmpty()) return TimerState.Idle
         return try {
             gson.fromJson(value, StateWrapper::class.java).state
         } catch (e: Exception) {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4271635b..0b64fc99 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 #jetbrains
-kotlin = "2.1.20"
+kotlin = "2.1.21"
 kotlinxSerializationJson = "1.6.3"
 #KSP
 ksp = "2.1.21-2.0.1"