diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index 88fb978c..161bfe47 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -1,6 +1,7 @@
 #include "Logic.h"
 #include "Script.h"
 #include "Network.h"
+#include "FileSystemUtils.h"
 
 void titlelogic()
 {
@@ -107,6 +108,7 @@ void gamecompletelogic2()
         map.colstate = 10;
         game.gamestate = TITLEMODE;
         graphics.fademode = 4;
+        FILESYSTEM_unmountassets(); // should be before music.playef(18)
         music.playef(18);
         game.returntomenu(Menu::play);
         game.createmenu(Menu::gamecompletecontinue);
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index acc3cc3f..248fea3c 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -3589,6 +3589,7 @@ void editorlogic()
         script.hardreset();
         graphics.fademode = 4;
         music.haltdasmusik();
+        FILESYSTEM_unmountassets(); // should be before music.play(6)
         music.play(6);
         map.nexttowercolour();
         ed.settingsmod=false;