diff --git a/libs/core/music.ts b/libs/core/music.ts
index 1b62279e..01b8b20a 100644
--- a/libs/core/music.ts
+++ b/libs/core/music.ts
@@ -342,8 +342,8 @@ namespace music {
                         control.raiseEvent(MICROBIT_MELODY_ID, MusicEvent.BackgroundMelodyResumed);
                     }
                 }
-                currentMelody = null;
                 control.raiseEvent(MICROBIT_MELODY_ID, currentMelody.background ? MusicEvent.BackgroundMelodyEnded : MusicEvent.MelodyEnded);
+                currentMelody = null;
             })
         }
     }
diff --git a/package.json b/package.json
index d4de35f1..fe38839a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pxt-microbit",
-  "version": "0.12.24",
+  "version": "0.12.25",
   "description": "micro:bit target for Microsoft MakeCode (PXT)",
   "keywords": [
     "JavaScript",
@@ -38,6 +38,6 @@
     "semantic-ui-less": "^2.2.4"
   },
   "dependencies": {
-    "pxt-core": "0.12.82"
+    "pxt-core": "0.12.83"
   }
 }