diff --git a/app/src/main/java/com/github/libretube/api/obj/Streams.kt b/app/src/main/java/com/github/libretube/api/obj/Streams.kt
index aa4ef6fce..1607cc204 100644
--- a/app/src/main/java/com/github/libretube/api/obj/Streams.kt
+++ b/app/src/main/java/com/github/libretube/api/obj/Streams.kt
@@ -2,18 +2,25 @@ package com.github.libretube.api.obj
 
 import com.github.libretube.db.obj.DownloadItem
 import com.github.libretube.enums.FileType
-import com.github.libretube.extensions.toLocalDateSafe
-import com.github.libretube.extensions.toMillis
 import com.github.libretube.helpers.ProxyHelper
+import com.github.libretube.json.SafeInstantSerializer
 import com.github.libretube.parcelable.DownloadData
-import kotlin.io.path.Path
+import kotlinx.datetime.Instant
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlin.io.path.Path
 
 @Serializable
 data class Streams(
     val title: String,
     val description: String,
-    val uploadDate: String,
+
+    @Serializable(SafeInstantSerializer::class)
+    @SerialName("uploadDate")
+    val uploadTimestamp: Instant,
+
     val uploader: String,
     val uploaderUrl: String,
     val uploaderAvatar: String? = null,
@@ -84,8 +91,9 @@ data class Streams(
             uploaderName = uploader,
             uploaderUrl = uploaderUrl,
             uploaderAvatar = uploaderAvatar,
-            uploadedDate = uploadDate,
-            uploaded = uploadDate.toLocalDateSafe().toMillis(),
+            uploadedDate = uploadTimestamp.toLocalDateTime(TimeZone.currentSystemDefault()).date
+                .toString(),
+            uploaded = uploadTimestamp.toEpochMilliseconds(),
             duration = duration,
             views = views,
             uploaderVerified = uploaderVerified,
diff --git a/app/src/main/java/com/github/libretube/db/Converters.kt b/app/src/main/java/com/github/libretube/db/Converters.kt
index c3e56a690..71bfb289a 100644
--- a/app/src/main/java/com/github/libretube/db/Converters.kt
+++ b/app/src/main/java/com/github/libretube/db/Converters.kt
@@ -2,18 +2,18 @@ package com.github.libretube.db
 
 import androidx.room.TypeConverter
 import com.github.libretube.api.JsonHelper
-import com.github.libretube.extensions.toLocalDateSafe
+import kotlinx.datetime.LocalDate
+import kotlinx.datetime.toLocalDate
+import kotlinx.serialization.encodeToString
 import java.nio.file.Path
 import kotlin.io.path.Path
-import kotlinx.datetime.LocalDate
-import kotlinx.serialization.encodeToString
 
 object Converters {
     @TypeConverter
     fun localDateToString(localDate: LocalDate?) = localDate?.toString()
 
     @TypeConverter
-    fun stringToLocalDate(string: String?) = string?.toLocalDateSafe()
+    fun stringToLocalDate(string: String?) = string?.toLocalDate()
 
     @TypeConverter
     fun pathToString(path: Path?) = path?.toString()
diff --git a/app/src/main/java/com/github/libretube/extensions/LocalDate.kt b/app/src/main/java/com/github/libretube/extensions/LocalDate.kt
index 338cec6c7..370d9a17a 100644
--- a/app/src/main/java/com/github/libretube/extensions/LocalDate.kt
+++ b/app/src/main/java/com/github/libretube/extensions/LocalDate.kt
@@ -3,8 +3,5 @@ package com.github.libretube.extensions
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.atStartOfDayIn
-import kotlinx.datetime.toLocalDate
 
 fun LocalDate.toMillis() = this.atStartOfDayIn(TimeZone.UTC).toEpochMilliseconds()
-
-fun String.toLocalDateSafe() = this.substring(0, 10).toLocalDate()
diff --git a/app/src/main/java/com/github/libretube/json/SafeInstantSerializer.kt b/app/src/main/java/com/github/libretube/json/SafeInstantSerializer.kt
new file mode 100644
index 000000000..0d063bb20
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/json/SafeInstantSerializer.kt
@@ -0,0 +1,32 @@
+package com.github.libretube.json
+
+import android.util.Log
+import com.github.libretube.extensions.TAG
+import kotlinx.datetime.Instant
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.atStartOfDayIn
+import kotlinx.datetime.toInstant
+import kotlinx.datetime.toLocalDate
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind.STRING
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+object SafeInstantSerializer : KSerializer<Instant> {
+    override val descriptor = PrimitiveSerialDescriptor("Instant", STRING)
+
+    override fun deserialize(decoder: Decoder): Instant {
+        val string = decoder.decodeString()
+        return try {
+            string.toInstant()
+        } catch (e: IllegalArgumentException) {
+            Log.e(TAG(), "Error parsing date '$string'", e)
+            string.toLocalDate().atStartOfDayIn(TimeZone.currentSystemDefault())
+        }
+    }
+
+    override fun serialize(encoder: Encoder, value: Instant) {
+        encoder.encodeString(value.toString())
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/services/DownloadService.kt b/app/src/main/java/com/github/libretube/services/DownloadService.kt
index 8e28534b4..148fbe1c9 100644
--- a/app/src/main/java/com/github/libretube/services/DownloadService.kt
+++ b/app/src/main/java/com/github/libretube/services/DownloadService.kt
@@ -28,7 +28,6 @@ import com.github.libretube.enums.FileType
 import com.github.libretube.extensions.formatAsFileSize
 import com.github.libretube.extensions.getContentLength
 import com.github.libretube.extensions.parcelableExtra
-import com.github.libretube.extensions.toLocalDateSafe
 import com.github.libretube.extensions.toastFromMainThread
 import com.github.libretube.helpers.DownloadHelper
 import com.github.libretube.helpers.DownloadHelper.getNotificationId
@@ -63,6 +62,8 @@ import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
 import okio.buffer
 import okio.sink
 import okio.source
@@ -116,7 +117,7 @@ class DownloadService : LifecycleService() {
                     streams.title,
                     streams.description,
                     streams.uploader,
-                    streams.uploadDate.toLocalDateSafe(),
+                    streams.uploadTimestamp.toLocalDateTime(TimeZone.currentSystemDefault()).date,
                     thumbnailTargetPath
                 )
                 Database.downloadDao().insertDownload(download)
diff --git a/app/src/main/java/com/github/libretube/ui/views/DescriptionLayout.kt b/app/src/main/java/com/github/libretube/ui/views/DescriptionLayout.kt
index 9df407cdc..627df76f3 100644
--- a/app/src/main/java/com/github/libretube/ui/views/DescriptionLayout.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/DescriptionLayout.kt
@@ -15,11 +15,12 @@ import com.github.libretube.R
 import com.github.libretube.api.obj.Streams
 import com.github.libretube.databinding.DescriptionLayoutBinding
 import com.github.libretube.extensions.formatShort
-import com.github.libretube.extensions.toLocalDateSafe
 import com.github.libretube.ui.activities.VideoTagsAdapter
 import com.github.libretube.util.HtmlParser
 import com.github.libretube.util.LinkHandler
 import com.github.libretube.util.TextUtils
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.toLocalDateTime
 import java.util.Locale
 
 class DescriptionLayout(
@@ -135,7 +136,8 @@ class DescriptionLayout(
     private fun localizeDate(streams: Streams): String {
         if (streams.livestream) return ""
 
-        return TextUtils.SEPARATOR + TextUtils.localizeDate(streams.uploadDate.toLocalDateSafe())
+        val date = streams.uploadTimestamp.toLocalDateTime(TimeZone.currentSystemDefault()).date
+        return TextUtils.SEPARATOR + TextUtils.localizeDate(date)
     }
 
     companion object {