diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py
index 03db00cda..93e171e53 100644
--- a/openlp/core/ui/media/mediacontroller.py
+++ b/openlp/core/ui/media/mediacontroller.py
@@ -630,9 +630,10 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
         :param controller:  The Controller to be processed
         """
         if controller.media_info.playing:
-            print(controller.media_info.timer)
+            print("AA " + controller.media_info.timer, controller.media_info.length)
             if controller.media_info.timer > controller.media_info.length:
                 controller.media_info.timer = controller.media_info.length
+                print("over")
             controller.media_info.timer += 1000
             seconds = controller.media_info.timer // 1000
             print(seconds)
@@ -687,6 +688,7 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
             controller.mediabar.actions['playbackPause'].setVisible(False)
             controller.media_info.playing = False
             controller.media_info.timer = 1000
+            controller.media_timer = 0
 
     def media_volume_msg(self, msg):
         """
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 89cf6335d..59ca286a7 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -156,7 +156,6 @@ class SlideController(DisplayController, RegistryProperties):
         self.process_queue_lock = Lock()
         self.slide_selected_lock = Lock()
         self.timer_id = 0
-        self.media_timer = 0;
         self.song_edit = False
         self.selected_row = 0
         self.service_item = None
@@ -1303,8 +1302,6 @@ class SlideController(DisplayController, RegistryProperties):
         """
         if event.timerId() == self.timer_id:
             self.on_slide_selected_next(self.play_slides_loop.isChecked())
-        elif event.timerId() == self.media_timer:
-            self.media_controller.tick(self)
 
     def on_edit_song(self, field=None):
         """
@@ -1364,8 +1361,6 @@ class SlideController(DisplayController, RegistryProperties):
         if not self.is_live:
             self.preview_display.show()
             self.slide_preview.hide()
-        # One Second pings
-        self.media_timer = self.startTimer(1000)
 
     def on_media_close(self):
         """
@@ -1374,7 +1369,6 @@ class SlideController(DisplayController, RegistryProperties):
         self.media_controller.media_reset(self)
         self.preview_display.hide()
         self.slide_preview.show()
-        self.media_timer = 0
 
     def _reset_blank(self, no_theme):
         """