diff --git a/apps/wps.c b/apps/wps.c
index 1904387759..b0b3976e21 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -739,6 +739,12 @@ int wps_show(void)
         restore = true;
     }
 
+    if (mpeg_status() & MPEG_STATUS_PAUSE) {
+        paused = true;
+    } else {
+        paused = false;
+    }
+
     while ( 1 )
     {
 
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 9528ede0ec..e1312c7399 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -1300,6 +1300,7 @@ static void mpeg_thread(void)
                 /* Stop the current stream */
                 play_pending = false;
                 playing = false;
+                paused = false;
                 stop_dma();
 
                 reset_mp3_buffer();
@@ -1339,7 +1340,6 @@ static void mpeg_thread(void)
                 /* Tell the file loading code that we want to start playing
                    as soon as we have some data */
                 play_pending = true;
-                paused = false;
 
                 update_playlist();
                 current_track_counter++;