diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d4b3b4ea4..685abfd0ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is simplified version of [Keep a Changelog](https://keepachangelog.co
 
 ### Fixes
 - Fix sorting by latest chapter is not working properly
+- Prevent some NPE crashes
 
 ### Other
 - Update NDK to v27.2.12479018
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
index 6a06ec5673..9b288c450c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt
@@ -832,12 +832,13 @@ class MangaDetailsController :
     }
 
     private fun addMangaHeader() {
-        if (tabletAdapter?.scrollableHeaders?.isEmpty() == true) {
+        val tabletHeader = presenter.tabletChapterHeaderItem
+        if (tabletHeader != null && tabletAdapter?.scrollableHeaders?.isEmpty() == true) {
             tabletAdapter?.removeAllScrollableHeaders()
             tabletAdapter?.addScrollableHeader(presenter.headerItem)
             adapter?.removeAllScrollableHeaders()
-            adapter?.addScrollableHeader(presenter.tabletChapterHeaderItem!!)
-        } else if (!isTablet && adapter?.scrollableHeaders?.isEmpty() == true) {
+            adapter?.addScrollableHeader(tabletHeader)
+        } else if (adapter?.scrollableHeaders?.isEmpty() == true) {
             adapter?.removeAllScrollableHeaders()
             adapter?.addScrollableHeader(presenter.headerItem)
         }