diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
index 7b277838..0447588d 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Chapter.kt
@@ -241,7 +241,7 @@ object Chapter {
 
         return ImageResponse.findFileNameStartingWith(
             chapterDir,
-            getPageName(0, chapterDir)
+            getPageName(0)
         ) != null
     }
 
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt
index 52485420..d6bfa6aa 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/Page.kt
@@ -14,19 +14,14 @@ import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
-import org.kodein.di.DI
-import org.kodein.di.conf.global
-import org.kodein.di.instance
 import suwayomi.tachidesk.manga.impl.util.getChapterDir
 import suwayomi.tachidesk.manga.impl.util.lang.awaitSingle
 import suwayomi.tachidesk.manga.impl.util.source.GetCatalogueSource.getCatalogueSourceOrStub
-import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse
 import suwayomi.tachidesk.manga.impl.util.storage.ImageResponse.getImageResponse
 import suwayomi.tachidesk.manga.impl.util.storage.ImageUtil
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 import suwayomi.tachidesk.manga.model.table.MangaTable
 import suwayomi.tachidesk.manga.model.table.PageTable
-import suwayomi.tachidesk.server.ApplicationDirs
 import java.io.File
 import java.io.InputStream
 
@@ -87,26 +82,15 @@ object Page {
 
         val chapterDir = getChapterDir(mangaId, chapterId)
         File(chapterDir).mkdirs()
-        val fileName = getPageName(index, chapterDir) // e.g. 001
+        val fileName = getPageName(index)
 
         return getImageResponse(chapterDir, fileName, useCache) {
             source.fetchImage(tachiyomiPage).awaitSingle()
         }
     }
 
-    // TODO(v0.6.0) : zero based pages are deprecated
-    fun getPageName(index: Int, chapterDir: String): String {
-        val zeroBasedPageExists = ImageResponse.findFileNameStartingWith(
-            chapterDir,
-            formatPageName(0)
-        ) != null
-
-        if (zeroBasedPageExists) return formatPageName(index)
-
-        return formatPageName(index + 1)
+    /** converts 0 to "001" */
+    fun getPageName(index: Int): String {
+        return String.format("%03d", index + 1)
     }
-
-    private fun formatPageName(index: Int) = String.format("%03d", index)
-
-    private val applicationDirs by DI.global.instance<ApplicationDirs>()
 }
diff --git a/server/src/test/kotlin/suwayomi/tachidesk/manga/impl/PageTest.kt b/server/src/test/kotlin/suwayomi/tachidesk/manga/impl/PageTest.kt
new file mode 100644
index 00000000..14ed3a5a
--- /dev/null
+++ b/server/src/test/kotlin/suwayomi/tachidesk/manga/impl/PageTest.kt
@@ -0,0 +1,30 @@
+package suwayomi.tachidesk.manga.impl
+
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
+import org.junit.jupiter.api.Test
+import suwayomi.tachidesk.manga.impl.Page.getPageName
+import suwayomi.tachidesk.test.ApplicationTest
+import kotlin.test.assertEquals
+
+class PageTest : ApplicationTest() {
+
+    @Test
+    fun testGetPageName() {
+        val tests = listOf(0, 1, 2, 100)
+
+        val testResults = tests.map {
+            getPageName(it)
+        }
+
+        assertEquals(testResults[0], "001")
+        assertEquals(testResults[1], "002")
+        assertEquals(testResults[2], "003")
+        assertEquals(testResults[3], "101")
+    }
+}