diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
index b34ac77f09..8c113cfd07 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/Manga.kt
@@ -103,16 +103,14 @@ interface Manga : SManga {
         val currentTags = genre?.split(",")?.map { it.trim().toLowerCase(Locale.US) }
         return if (currentTags?.any
             { tag ->
-                tag == "long strip" || tag == "manhwa" ||
-                    tag.contains("webtoon")
-            } == true || isWebtoonSource(sourceName) ||
-            sourceName.contains("tapastic", true))
+                tag == "long strip" || tag == "manhwa" || tag.contains("webtoon")
+            } == true || isWebtoonSource(sourceName))
             ReaderActivity.WEBTOON
         else if (currentTags?.any
             { tag ->
                 tag == "chinese" || tag == "manhua" ||
                     tag.startsWith("english") || tag == "comic"
-            } == true || isComicSource(sourceName) ||
+            } == true || (isComicSource(sourceName) && !sourceName.contains("tapastic", true)) ||
             sourceName.contains("manhua", true))
             ReaderActivity.LEFT_TO_RIGHT
         else 0
@@ -126,7 +124,6 @@ interface Manga : SManga {
 
     fun isComicSource(sourceName: String): Boolean {
         return sourceName.contains("gunnerkrigg", true) ||
-            sourceName.contains("gunnerkrigg", true) ||
             sourceName.contains("dilbert", true) ||
             sourceName.contains("cyanide", true) ||
             sourceName.contains("xkcd", true) ||
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 7cbefcf610..9ce460eaa4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -420,7 +420,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>(),
                     ).toLowerCase(Locale.getDefault())
                 ), 8000
             ) {
-                setAction(R.string.use_default) {
+                if (mangaViewer != WEBTOON) setAction(R.string.use_default) {
                     presenter.setMangaViewer(0)
                 }
             }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index d22606ec52..af50de7391 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -419,8 +419,10 @@ class ReaderPresenter(
      */
     fun getMangaViewer(): Int {
         val manga = manga ?: return preferences.defaultViewer()
-        if (manga.viewer == -1) {
-            manga.viewer = manga.defaultReaderType()
+        val readerType = manga.defaultReaderType()
+        if (manga.viewer == -1 ||
+            (readerType == ReaderActivity.WEBTOON && readerType != manga.viewer)) {
+            manga.viewer = readerType
             db.updateMangaViewer(manga).asRxObservable().subscribe()
         }
         return if (manga.viewer == 0) preferences.defaultViewer() else manga.viewer