diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index 1102efaff..5a18d7b79 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -713,6 +713,7 @@ SQL;
             'end'               => $stream_end,
             'uri'               => $uri,
             'type'              => 'stream_buffer_end',
+            'row_id'            => $item["id"],
             'independent_event' => true
         );
         self::appendScheduleItem($data, $stream_end, $schedule_item);
diff --git a/python_apps/pypo/pypopush.py b/python_apps/pypo/pypopush.py
index 87e1704bf..ad28abef9 100644
--- a/python_apps/pypo/pypopush.py
+++ b/python_apps/pypo/pypopush.py
@@ -455,6 +455,7 @@ class PypoPush(Thread):
             tn = telnetlib.Telnet(LS_HOST, LS_PORT)
 
             msg = 'dynamic_source.id %s\n' % media_item['row_id']
+            self.logger.debug(msg)
             tn.write(msg)
 
             #example: dynamic_source.read_start http://87.230.101.24:80/top100station.mp3
@@ -523,7 +524,7 @@ class PypoPush(Thread):
             tn = telnetlib.Telnet(LS_HOST, LS_PORT)
             #dynamic_source.stop http://87.230.101.24:80/top100station.mp3
 
-            msg = 'dynamic_source.read_stop %s\n' % media_item['uri'].encode('latin-1')
+            msg = 'dynamic_source.read_stop %s\n' % media_item['row_id']
             self.logger.debug(msg)
             tn.write(msg)