diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
index 2d473fbb..e77fd997 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingNotificationHelper.java
@@ -263,7 +263,7 @@ public class PlayingNotificationHelper {
         this.isPlaying = isPlaying;
 
         if (notification == null) {
-            updateNotification();
+            return;
         }
         if (notificationLayout != null) {
             notificationLayout.setImageViewResource(R.id.action_play_pause,
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index c873426b..7d0cedf0 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -663,11 +663,11 @@ public class MusicService extends Service {
                     } else {
                         registerReceiversAndRemoteControlClient();
                         player.start();
-                        notifyChange(PLAY_STATE_CHANGED);
                         if (notNotifiedMetaChangedForCurrentTrack) {
                             notifyChange(META_CHANGED);
                             notNotifiedMetaChangedForCurrentTrack = false;
                         }
+                        notifyChange(PLAY_STATE_CHANGED);
                     }
                 }
             } else {