diff --git a/make_playlist.py b/make_playlist.py
index c6b7220..143655c 100755
--- a/make_playlist.py
+++ b/make_playlist.py
@@ -103,6 +103,9 @@ class Channel:
         self.url = self.url[self.url.find("(")+1:self.url.rfind(")")]
         self.logo = parts[4].strip()
         self.logo = self.logo[self.logo.find('src="')+5:self.logo.rfind('"')]
+
+        self.chno = self.number if self.number and self.number != "0" else None
+        
         if len(parts) > 6:
             self.epg = parts[5].strip()
         else:
@@ -110,10 +113,11 @@ class Channel:
 
     def to_m3u_line(self):
         country = f' tvg-country="{self.country_code}"' if self.country_code else ""
+        chno = f' tvg-chno="{self.chno}"' if self.chno else ""
         if self.epg is None:
-            return (f'#EXTINF:-1 tvg-name="{self.name}" tvg-logo="{self.logo}"{country} group-title="{self.group}",{self.name}\n{self.url}')
+            return (f'#EXTINF:-1 tvg-name="{self.name}" tvg-logo="{self.logo}"{chno}{country} group-title="{self.group}",{self.name}\n{self.url}')
         else:
-            return (f'#EXTINF:-1 tvg-name="{self.name}" tvg-logo="{self.logo}" tvg-id="{self.epg}"{country} group-title="{self.group}",{self.name}\n{self.url}')
+            return (f'#EXTINF:-1 tvg-name="{self.name}" tvg-logo="{self.logo}" tvg-id="{self.epg}"{chno}{country} group-title="{self.group}",{self.name}\n{self.url}')
 
 
 def main():