diff --git a/src/epgdb.c b/src/epgdb.c
index a45d9e92..86cbd6d5 100644
--- a/src/epgdb.c
+++ b/src/epgdb.c
@@ -268,10 +268,8 @@ void epg_save ( void *p )
 {
   int fd;
   epg_object_t *eo;
-#if 0
   epg_broadcast_t *ebc;
   channel_t *ch;
-#endif
   epggrab_stats_t stats;
   extern gtimer_t epggrab_save_timer;
 
@@ -303,14 +301,12 @@ void epg_save ( void *p )
     stats.seasons.total++;
   }
   if ( _epg_write_sect(fd, "broadcasts") ) return;
-#if 0
-  RB_FOREACH(ch, &channel_name_tree, ch_name_link) {
+  CHANNEL_FOREACH(ch) {
     RB_FOREACH(ebc, &ch->ch_epg_schedule, sched_link) {
       if (_epg_write(fd, epg_broadcast_serialize(ebc))) return;
       stats.broadcasts.total++;
     }
   }
-#endif
 
   /* Stats */
   tvhlog(LOG_INFO, "epgdb", "saved");