diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerControllerImpl.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerControllerImpl.java
index f47adad9..bcc7e4bb 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerControllerImpl.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerControllerImpl.java
@@ -176,28 +176,6 @@ public class MediaPlayerControllerImpl implements MediaPlayerController
 		});
 	}
 
-	@Override
-	public synchronized void seekTo(final int position)
-	{
-		MediaPlayerService.executeOnStartedMediaPlayerService(context, new Consumer<MediaPlayerService>() {
-			@Override
-			public void accept(MediaPlayerService mediaPlayerService) {
-				mediaPlayerService.seekTo(position);
-			}
-		});
-	}
-
-	@Override
-	public synchronized void pause()
-	{
-		MediaPlayerService.executeOnStartedMediaPlayerService(context, new Consumer<MediaPlayerService>() {
-			@Override
-			public void accept(MediaPlayerService mediaPlayerService) {
-				mediaPlayerService.pause();
-			}
-		});
-	}
-
 	@Override
 	public synchronized void start()
 	{
@@ -209,15 +187,25 @@ public class MediaPlayerControllerImpl implements MediaPlayerController
 		});
 	}
 
+	@Override
+	public synchronized void seekTo(final int position)
+	{
+		MediaPlayerService mediaPlayerService = MediaPlayerService.getRunningInstance();
+		if (mediaPlayerService != null) mediaPlayerService.seekTo(position);
+	}
+
+	@Override
+	public synchronized void pause()
+	{
+		MediaPlayerService mediaPlayerService = MediaPlayerService.getRunningInstance();
+		if (mediaPlayerService != null) mediaPlayerService.pause();
+	}
+
 	@Override
 	public synchronized void stop()
 	{
-		MediaPlayerService.executeOnStartedMediaPlayerService(context, new Consumer<MediaPlayerService>() {
-			@Override
-			public void accept(MediaPlayerService mediaPlayerService) {
-				mediaPlayerService.stop();
-			}
-		});
+		MediaPlayerService mediaPlayerService = MediaPlayerService.getRunningInstance();
+		if (mediaPlayerService != null) mediaPlayerService.stop();
 	}
 
 	@Override
diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.java
index 95bf2a59..f8c2611d 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.java
@@ -269,6 +269,7 @@ public class MediaPlayerLifecycleSupport
 					mediaPlayerController.togglePlayPause();
 					break;
 				case Constants.CMD_STOP:
+					// TODO: There is a stop() function, shouldn't we use that?
 					mediaPlayerController.pause();
 					mediaPlayerController.seekTo(0);
 					break;