diff --git a/.editorconfig b/.editorconfig
index c7c0ccbc7..fe6f1e7b4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -29,3 +29,4 @@ ktlint_standard_function-expression-body = disabled
 ktlint_standard_function-signature = disabled
 ktlint_standard_type-argument-comment = disabled
 ktlint_standard_type-parameter-comment = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
diff --git a/app/src/main/java/eu/kanade/presentation/reader/settings/ColorFilterPage.kt b/app/src/main/java/eu/kanade/presentation/reader/settings/ColorFilterPage.kt
index d0017aa41..19c4f0dde 100644
--- a/app/src/main/java/eu/kanade/presentation/reader/settings/ColorFilterPage.kt
+++ b/app/src/main/java/eu/kanade/presentation/reader/settings/ColorFilterPage.kt
@@ -28,7 +28,7 @@ internal fun ColumnScope.ColorFilterPage(screenModel: ReaderSettingsScreenModel)
         pref = screenModel.preferences.customBrightness(),
     )
 
-    /**
+    /*
      * Sets the brightness of the screen. Range is [-75, 100].
      * From -75 to -1 a semi-transparent black view is shown at the top with the minimum brightness.
      * From 1 to 100 it sets that value as brightness.
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 310c520b7..602492f1d 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
@@ -833,7 +833,7 @@ class ReaderActivity : BaseActivity() {
 
         private val grayBackgroundColor = Color.rgb(0x20, 0x21, 0x25)
 
-        /**
+        /*
          * Initializes the reader subscriptions.
          */
         init {
diff --git a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt
index e18fa4299..1223d51a4 100644
--- a/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt
+++ b/core/common/src/main/kotlin/eu/kanade/tachiyomi/network/interceptor/WebViewInterceptor.kt
@@ -33,7 +33,7 @@ abstract class WebViewInterceptor(
         // Crashes on some devices. We skip this in some cases since the only impact is slower
         // WebView init in those rare cases.
         // See https://bugs.chromium.org/p/chromium/issues/detail?id=1279562
-        if (DeviceUtil.isMiui || Build.VERSION.SDK_INT == Build.VERSION_CODES.S && DeviceUtil.isSamsung) {
+        if (DeviceUtil.isMiui || (Build.VERSION.SDK_INT == Build.VERSION_CODES.S && DeviceUtil.isSamsung)) {
             return@lazy
         }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 17c005ca7..722fb3a6b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ sqldelight = "2.2.1"
 sqlite = "2.6.2"
 voyager = "1.1.0-beta03"
 spotless = "8.1.0"
-ktlint-core = "1.7.1"
+ktlint-core = "1.8.0"
 firebase-bom = "34.6.0"
 markdown = "0.38.1"
 junit = "6.0.1"
diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/util/Elevation.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Elevation.kt
index 67792fbaf..a3001aa3e 100644
--- a/presentation-core/src/main/java/tachiyomi/presentation/core/util/Elevation.kt
+++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Elevation.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/**
+/*
  * Straight copy from Compose M3 for Button fork
  */
 
diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt
index 4ea8c5989..0bdbd7d98 100644
--- a/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt
+++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt
@@ -24,7 +24,7 @@ package tachiyomi.presentation.core.util
  * SOFTWARE.
  */
 
-/**
+/*
  * Code taken from https://gist.github.com/mxalbert1996/33a360fcab2105a31e5355af98216f5a
  * with some modifications to handle contentPadding.
  *