diff --git a/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt b/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt
index 9a7dcb83..2bddbc4a 100644
--- a/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt
+++ b/src/main/kotlin/ca/gosyer/ui/base/components/KtorImage.kt
@@ -48,7 +48,7 @@ fun KtorImage(
     BoxWithConstraints {
         val drawable: MutableState<ImageBitmap?> = remember { mutableStateOf(null) }
         val loading: MutableState<Boolean> = remember { mutableStateOf(true) }
-        val progress: MutableState<Float?> = remember { mutableStateOf(null) }
+        val progress: MutableState<Float> = remember { mutableStateOf(0.0F) }
         val error: MutableState<String?> = remember { mutableStateOf(null) }
         DisposableEffect(imageUrl) {
             val handler = CoroutineExceptionHandler { _, throwable ->
diff --git a/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt b/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt
index 9d556bdd..d01a770d 100644
--- a/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt
+++ b/src/main/kotlin/ca/gosyer/ui/base/components/LoadingScreen.kt
@@ -22,7 +22,7 @@ fun LoadingScreen(
     isLoading: Boolean = true,
     modifier: Modifier = Modifier.fillMaxSize(),
     /*@FloatRange(from = 0.0, to = 1.0)*/
-    progress: Float? = null,
+    progress: Float = 0.0F,
     errorMessage: String? = null,
     retryMessage: String = "Retry",
     retry: (() -> Unit)? = null
@@ -33,10 +33,8 @@ fun LoadingScreen(
                 val size = remember(maxHeight, maxWidth) {
                     min(maxHeight, maxWidth) / 2
                 }
-                // Workaround for random `Cannot round NaN value.` exception
-                val floatProgress = progress ?: 0F
-                if (progress != null) {
-                    CircularProgressIndicator(floatProgress, Modifier.align(Alignment.Center).size(size))
+                if (progress != 0.0F) {
+                    CircularProgressIndicator(progress, Modifier.align(Alignment.Center).size(size))
                 } else {
                     CircularProgressIndicator(Modifier.align(Alignment.Center).size(size))
                 }
diff --git a/src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt b/src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt
index 71c17021..8fadf19e 100644
--- a/src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt
+++ b/src/main/kotlin/ca/gosyer/ui/reader/ReaderMenu.kt
@@ -224,7 +224,7 @@ fun ReaderMenu(chapterIndex: Int, mangaId: Long, setHotkeys: (List<KeyboardShort
 fun ReaderImage(
     imageIndex: Int,
     drawable: ImageBitmap?,
-    progress: Float?,
+    progress: Float,
     status: ReaderPage.Status,
     error: String?,
     imageModifier: Modifier = Modifier.fillMaxSize(),
diff --git a/src/main/kotlin/ca/gosyer/ui/reader/loader/TachideskPageLoader.kt b/src/main/kotlin/ca/gosyer/ui/reader/loader/TachideskPageLoader.kt
index 5ca9355a..6a1c3d49 100644
--- a/src/main/kotlin/ca/gosyer/ui/reader/loader/TachideskPageLoader.kt
+++ b/src/main/kotlin/ca/gosyer/ui/reader/loader/TachideskPageLoader.kt
@@ -112,7 +112,7 @@ class TachideskPageLoader(
                 ReaderPage(
                     it,
                     MutableStateFlow(null),
-                    MutableStateFlow(null),
+                    MutableStateFlow(0.0F),
                     MutableStateFlow(ReaderPage.Status.QUEUE),
                     MutableStateFlow(null)
                 )
diff --git a/src/main/kotlin/ca/gosyer/ui/reader/model/ReaderPage.kt b/src/main/kotlin/ca/gosyer/ui/reader/model/ReaderPage.kt
index ad30f326..e4c28e14 100644
--- a/src/main/kotlin/ca/gosyer/ui/reader/model/ReaderPage.kt
+++ b/src/main/kotlin/ca/gosyer/ui/reader/model/ReaderPage.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 data class ReaderPage(
     val index: Int,
     val bitmap: MutableStateFlow<ImageBitmap?>,
-    val progress: MutableStateFlow<Float?>,
+    val progress: MutableStateFlow<Float>,
     val status: MutableStateFlow<Status>,
     val error: MutableStateFlow<String?>
 ) {