diff --git a/app/src/gambas3/.src/Welcome/FWelcome.class b/app/src/gambas3/.src/Welcome/FWelcome.class
index c961892db..f86f2ab9c 100644
--- a/app/src/gambas3/.src/Welcome/FWelcome.class
+++ b/app/src/gambas3/.src/Welcome/FWelcome.class
@@ -460,9 +460,9 @@ Public Sub MediaPlayer_End()
   
 End
 
-
-Public Sub Form_Arrange()
-
+Public Sub Form_Close()
+  
+  $hPlayer.Stop()
+  $hPlayer = Null
   
-
 End