diff --git a/scripts/init-husky.sh b/scripts/init-husky.sh
index 38c61a8d..3c7f3dd5 100755
--- a/scripts/init-husky.sh
+++ b/scripts/init-husky.sh
@@ -3,8 +3,8 @@
 # Check if bunx is installed
 if command -v bun &> /dev/null; then
   # Run the command with bunx
-  bun -e "if (process.env.NODE_ENV !== 'production'){process.exit(1)}" || bunx husky install
+  bun -e "if (process.env.NODE_ENV !== 'production'){process.exit(1)}" || bunx husky
 else
   # Fall back to npx if bunx is not available
-  node -e "if (process.env.NODE_ENV !== 'production'){process.exit(1)}" || husky install
+  node -e "if (process.env.NODE_ENV !== 'production'){process.exit(1)}" || npx husky
 fi
\ No newline at end of file
diff --git a/server/src/stream/OfflineProgramStream.ts b/server/src/stream/OfflineProgramStream.ts
index f720a82c..9537649c 100644
--- a/server/src/stream/OfflineProgramStream.ts
+++ b/server/src/stream/OfflineProgramStream.ts
@@ -43,7 +43,7 @@ export class OfflineProgramStream extends ProgramStream {
         this.context.streamMode,
       );
       const lineupItem = this.context.lineupItem;
-      let duration = dayjs.duration(lineupItem.streamDuration ?? 0);
+      let duration = dayjs.duration(lineupItem.streamDuration);
       const start = dayjs.duration(lineupItem.startOffset ?? 0);
       if (+duration > +start) {
         duration = duration.subtract(start);
diff --git a/server/src/stream/StreamProgramCalculator.ts b/server/src/stream/StreamProgramCalculator.ts
index a675a169..2389232b 100644
--- a/server/src/stream/StreamProgramCalculator.ts
+++ b/server/src/stream/StreamProgramCalculator.ts
@@ -312,7 +312,6 @@ export class StreamProgramCalculator {
     timestamp: number,
     channel: MinimalChannelDetails,
     channelLineup: Lineup,
-    streamDuration?: number,
   ): Promise<ProgramAndTimeElapsed> {
     if (channel.startTime > timestamp) {
       this.logger.debug(
@@ -376,7 +375,7 @@ export class StreamProgramCalculator {
         (currentProgramIndex + 1) % channelLineup.items.length
       ].durationMs;
 
-    streamDuration ??= nextOffset - currOffset - elapsed;
+    const streamDuration = nextOffset - currOffset - elapsed;
 
     const lineupItem = channelLineup.items[currentProgramIndex];
     let program: EnrichedLineupItem;
diff --git a/server/src/stream/emby/EmbyProgramStream.ts b/server/src/stream/emby/EmbyProgramStream.ts
index a6d89ee4..39c956fb 100644
--- a/server/src/stream/emby/EmbyProgramStream.ts
+++ b/server/src/stream/emby/EmbyProgramStream.ts
@@ -117,10 +117,7 @@ export class EmbyProgramStream extends ProgramStream {
       },
       options: {
         startTime: start,
-        duration:
-          +start === 0
-            ? dayjs.duration(lineupItem.duration)
-            : dayjs.duration(lineupItem.streamDuration ?? lineupItem.duration),
+        duration: dayjs.duration(lineupItem.streamDuration),
         watermark,
         realtime: this.context.realtime,
         extraInputHeaders: {},
diff --git a/server/src/stream/jellyfin/JellyfinProgramStream.ts b/server/src/stream/jellyfin/JellyfinProgramStream.ts
index 6fcad9ad..ba4d0372 100644
--- a/server/src/stream/jellyfin/JellyfinProgramStream.ts
+++ b/server/src/stream/jellyfin/JellyfinProgramStream.ts
@@ -117,10 +117,7 @@ export class JellyfinProgramStream extends ProgramStream {
       },
       options: {
         startTime: start,
-        duration:
-          +start === 0
-            ? dayjs.duration(lineupItem.duration)
-            : dayjs.duration(lineupItem.streamDuration ?? lineupItem.duration),
+        duration: dayjs.duration(lineupItem.streamDuration),
         watermark,
         realtime: this.context.realtime,
         extraInputHeaders: {},
diff --git a/server/src/stream/plex/PlexProgramStream.ts b/server/src/stream/plex/PlexProgramStream.ts
index 8ff04680..f1087ae1 100644
--- a/server/src/stream/plex/PlexProgramStream.ts
+++ b/server/src/stream/plex/PlexProgramStream.ts
@@ -126,11 +126,7 @@ export class PlexProgramStream extends ProgramStream {
       },
       options: {
         startTime: start,
-        duration: dayjs.duration(
-          +start === 0
-            ? lineupItem.duration
-            : (lineupItem.streamDuration ?? lineupItem.duration),
-        ),
+        duration: dayjs.duration(lineupItem.streamDuration),
         watermark,
         realtime: this.context.realtime,
         outputFormat: this.outputFormat,