diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cdf70799..2bfb45bc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,6 +39,10 @@ jobs:
 
           flutter pub get
 
+      - name: Install saf_util development dependencies
+        working-directory: packages/saf_util
+        run: flutter pub get
+
       - name: Verify generated files committed
         run: scripts/codegen.sh --check
 
diff --git a/analysis_options.yaml b/analysis_options.yaml
index d1edb40a..35a78da4 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -18,6 +18,9 @@ linter:
     avoid_print: true
 
 dart_code_linter:
+  metrics-exclude:
+    - "test/**"
+
   extends:
     - package:dart_code_linter/presets/recommended.yaml
 
diff --git a/lib/widgets/video_controls/widgets/content_strip.dart b/lib/widgets/video_controls/widgets/content_strip.dart
index 622f040f..ea6d9b6d 100644
--- a/lib/widgets/video_controls/widgets/content_strip.dart
+++ b/lib/widgets/video_controls/widgets/content_strip.dart
@@ -105,6 +105,11 @@ class ContentStripState extends State<ContentStrip> {
   }
 
   void _bindChapterIndexStream() {
+    if (!_hasChapters) {
+      _chapterIndexStream = const Stream<int?>.empty();
+      return;
+    }
+
     _chapterIndexStream = widget.player.streams.position
         .map((position) => MediaChapter.indexAtPosition(position, widget.chapters))
         .distinct();
diff --git a/pubspec.lock b/pubspec.lock
index d633b372..99863ccb 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -9,6 +9,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "93.0.0"
+  analysis_server_plugin:
+    dependency: transitive
+    description:
+      name: analysis_server_plugin
+      sha256: "5f3920acbd5765764ec9ef6c5bbdd102015424281232ee4fb4f5431c87abb4eb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.7"
   analyzer:
     dependency: transitive
     description:
@@ -315,10 +323,10 @@ packages:
     dependency: "direct dev"
     description:
       name: dart_code_linter
-      sha256: "8ece88f710621ca1c40b6c344b316d78bb2269d728d37d2a44f19a81d9d2cb93"
+      sha256: "44cce8527a2094201067b50aed97778930638cc43e8bb3cb0b40a90c36fb9c84"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.6"
   dart_discord_presence:
     dependency: "direct main"
     description:
@@ -1503,6 +1511,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.3"
+  yaml_edit:
+    dependency: transitive
+    description:
+      name: yaml_edit
+      sha256: "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.4"
 sdks:
   dart: ">=3.12.0 <4.0.0"
   flutter: ">=3.44.0"