diff --git a/apps/output/views.py b/apps/output/views.py
index a1ea6f45..c5b606ad 100644
--- a/apps/output/views.py
+++ b/apps/output/views.py
@@ -23,7 +23,7 @@ def generate_m3u(request, profile_name=None):
     m3u_content = "#EXTM3U\n"
     for channel in channels:
         group_title = channel.channel_group.name if channel.channel_group else "Default"
-        tvg_id = channel.tvg_id or ""
+        tvg_id = channel.number or channel.id
         tvg_name = channel.tvg_id or channel.name
         tvg_logo = channel.logo.url if channel.logo else ""
         channel_number = channel.channel_number
@@ -88,7 +88,7 @@ def generate_epg(request, profile_name=None):
 
     # Retrieve all active channels
     for channel in channels:
-        channel_id = channel.epg_data.tvg_id if channel.epg_data else f"default-{channel.id}"
+        channel_id = channel.number or channel.id
         display_name = channel.epg_data.name if channel.epg_data else channel.name
         xml_lines.append(f'  <channel id="{channel_id}">')
         xml_lines.append(f'    <display-name>{display_name}</display-name>')