diff --git a/Dockerfile b/Dockerfile
index cab6b0e..65d104d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -77,7 +77,8 @@ ENV PUID=1000 \
     embyPORT=8096 \
     embyApiKey= \
     embyID= \
-    use_plexAPI=no
+    use_plexAPI=no \
+    trim_xmltv=yes
 
 # Expose Port
 EXPOSE ${XTEVE_PORT}
diff --git a/Dockerfile-aarch64 b/Dockerfile-aarch64
index 63f08bf..3687c73 100644
--- a/Dockerfile-aarch64
+++ b/Dockerfile-aarch64
@@ -14,15 +14,15 @@ RUN tar xzf /tmp/s6overlay.tar.gz -C / \
 # Add packages
 RUN apk upgrade --update --no-cache \
     && apk add --no-cache \
-            ca-certificates \
-            curl \
-            tzdata \
-            bash \
-            coreutils \
-            shadow \
-            ffmpeg \
-            vlc \
-            gnutls-utils
+    ca-certificates \
+    curl \
+    tzdata \
+    bash \
+    coreutils \
+    shadow \
+    ffmpeg \
+    vlc \
+    gnutls-utils
 
 # pi4 library to run lazystream: https://github.com/ljfranklin/alpine-pkg-glibc/releases/tag/2.32-r0-arm64
 RUN wget https://github.com/ljfranklin/alpine-pkg-glibc/releases/download/2.32-r0-arm64/glibc-2.32-r0.apk
@@ -33,7 +33,7 @@ RUN apk add --allow-untrusted glibc-bin-2.32-r0.apk
 
 RUN wget https://github.com/ljfranklin/alpine-pkg-glibc/releases/download/2.32-r0-arm64/glibc-i18n-2.32-r0.apk
 RUN apk add --allow-untrusted glibc-i18n-2.32-r0.apk
-                       
+
 # Update Timezone
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -87,7 +87,8 @@ ENV PUID=1000 \
     embyPORT=8096 \
     embyApiKey= \
     embyID= \
-    use_plexAPI=no
+    use_plexAPI=no \
+    trim_xmltv=yes
 
 # Expose Port
 EXPOSE ${XTEVE_PORT}
diff --git a/root/cronjob.sh b/root/cronjob.sh
index e54105f..947ae39 100755
--- a/root/cronjob.sh
+++ b/root/cronjob.sh
@@ -15,6 +15,8 @@ echo "Running scripts..."
 if [ "$use_lazystream" = "yes" ]; then
 
 	args=()
+
+	if [ "$trim_xmltv" = "yes" ]; then args+=("--trim"); fi
 	if [ ! -z ${quality} ]; then args+=("--quality" "$quality"); fi
 	if [ "$cdn" = "l3c" ]; then args+=("--cdn" "l3c"); fi
 
diff --git a/sample.env b/sample.env
index a2e6901..6301658 100644
--- a/sample.env
+++ b/sample.env
@@ -9,6 +9,10 @@ XTEVE_PORT=34400
 use_xTeveAPI=yes
 
 ### Lazystream Config
+# If trim_xmltv is set to no, both NHL and MLB will output 100 placeholder channels each.
+# Any unused channels will still display in your guide. Disable this feature if you have
+# any trouble with Plex/Emby/etc. guide data.
+trim_xmltv=yes
 use_lazystream=yes
 include_nhl=yes
 #nhl_exclude_home=yes
diff --git a/xteve_lazystream.xml b/xteve_lazystream.xml
index 864f76b..1b5e4c8 100644
--- a/xteve_lazystream.xml
+++ b/xteve_lazystream.xml
@@ -83,6 +83,11 @@
       <Name>use_lazystream</Name>
       <Mode/>
     </Variable>
+    <Variable>
+      <Value>yes</Value>
+      <Name>trim_xmltv</Name>
+      <Mode/>
+    </Variable>
     <Variable>
       <Value>yes</Value>
       <Name>include_nhl</Name>
@@ -167,6 +172,7 @@
   <Config Name="Path" Target="/playlists" Default="/mnt/user/appdata/xteve/playlists/" Mode="rw" Description="Container Path: /playlists" Type="Path" Display="always" Required="false" Mask="false">/mnt/user/appdata/xteve/playlists/</Config>
   <Config Name="Xteve API" Target="use_xTeveAPI" Default="yes" Mode="" Description="Container Variable: use_xTeveAPI" Type="Variable" Display="always" Required="false" Mask="false">yes</Config>
   <Config Name="Use Lazystream" Target="use_lazystream" Default="yes" Mode="" Description="Container Variable: use_lazystream" Type="Variable" Display="always" Required="false" Mask="false">yes</Config>
+  <Config Name="Trim XMLTV" Target="trim_xmltv" Default="yes" Mode="" Description="Container Variable: trim_xmltv" Type="Variable" Display="always" Required="false" Mask="false">yes</Config>
   <Config Name="Include NHL" Target="include_nhl" Default="yes" Mode="" Description="Container Variable: include_nhl" Type="Variable" Display="always" Required="false" Mask="false">yes</Config>
   <Config Name="include MLB" Target="include_mlb" Default="yes" Mode="" Description="Container Variable: include_mlb" Type="Variable" Display="always" Required="false" Mask="false">yes</Config>
   <Config Name="Use Guide2go" Target="use_guide2go" Default="no" Mode="" Description="Container Variable: use_guide2go" Type="Variable" Display="always" Required="false" Mask="false">no</Config>