diff --git a/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java b/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java
index f8bedcf8..c9e390ef 100644
--- a/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java
@@ -257,7 +257,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
     @Override
     public void onCompletion(MediaPlayer mp) {
         notifyOnMusicRemoteEventListeners(MusicRemoteEvent.SONG_COMPLETED);
-        if (isLastTrack()) {
+        if (isLastTrack() && getRepeatMode() == REPEAT_MODE_NONE) {
             notifyOnMusicRemoteEventListeners(MusicRemoteEvent.QUEUE_COMPLETED);
             playingNotificationHelper.updatePlayState(isPlaying());
             remoteControlClient.setPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java
index 6c56547c..f9f7d421 100644
--- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java
+++ b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java
@@ -76,8 +76,6 @@ public class MusicControllerActivity extends AbsFabActivity implements OnMusicRe
 
         moveSeekBarIntoPlace();
 
-        updateCurrentSong();
-
         setUpMusicControllers();
 
         prepareViewsForOpenAnimation();
@@ -86,7 +84,7 @@ public class MusicControllerActivity extends AbsFabActivity implements OnMusicRe
     }
 
     private void updateCurrentSong() {
-        getCurrentSongAndQueue();
+        getCurrentSong();
         setHeadersText();
         setUpArtistArt();
         setUpAlbumArtAndApplyPalette();
@@ -176,11 +174,9 @@ public class MusicControllerActivity extends AbsFabActivity implements OnMusicRe
         }
     }
 
-    private void getCurrentSongAndQueue() {
-        if (getApp().getMusicPlayerRemote().getPosition() >= 0) {
-            song = getApp().getMusicPlayerRemote().getPlayingQueue().get(getApp().getMusicPlayerRemote().getPosition());
-        } else {
-            song = new Song();
+    private void getCurrentSong() {
+        song = getApp().getMusicPlayerRemote().getCurrentSong();
+        if(song.id == -1){
             finish();
         }
     }
@@ -308,6 +304,7 @@ public class MusicControllerActivity extends AbsFabActivity implements OnMusicRe
     protected void onResume() {
         super.onResume();
         startMusicControllerStateUpdateThread();
+        updateCurrentSong();
     }
 
     private void startMusicControllerStateUpdateThread() {