diff --git a/GoldWars/GoldWars/SoundManager.swift b/GoldWars/GoldWars/SoundManager.swift
index 7a87b01..473e8e4 100644
--- a/GoldWars/GoldWars/SoundManager.swift
+++ b/GoldWars/GoldWars/SoundManager.swift
@@ -38,6 +38,7 @@ class SoundManager {
     }
     
     func playSoundEffect(pathToFile: String, fileExtension: String, volumeLevel: Float){
+        self.isMusicPlaying = true
         soundEffect = Bundle.main.url(forResource: pathToFile, withExtension: fileExtension)
         do {
             effectPlayer = try AVAudioPlayer(contentsOf: soundEffect!)
@@ -45,7 +46,11 @@ class SoundManager {
             os_log("Could not load sound file %@", log: LOG, type: .error, pathToFile)
         }
         effectPlayer.volume += volumeLevel
-        effectPlayer.play()
+        effectPlayer.prepareToPlay()
+        if self.isMusicEnabled == true {
+            effectPlayer.play()
+            UserDefaults.standard.set(false, forKey: "noMusic")
+        }
     }
 
     func stopMenuMusic() {