diff --git a/src/Engine/Sound/SoundManager.cpp b/src/Engine/Sound/SoundManager.cpp
index d75e9afc..b952426c 100644
--- a/src/Engine/Sound/SoundManager.cpp
+++ b/src/Engine/Sound/SoundManager.cpp
@@ -101,9 +101,17 @@ void SoundManager::updateEmitters(double dt)
         if (!m_World->ValidEntity(it->first)) {
             return;
         }
+        if (!m_World->HasComponent(it->first, "SoundEmitter")) 
+            return;
+        
         glm::vec3 previousPos;
         alGetSource3f(it->second->ALsource, AL_POSITION, &previousPos.x, &previousPos.y, &previousPos.z);
         // Get next pos
+        if (!m_World->HasComponent(it->first, "Transform"))
+            return;
+        if (!m_World->ValidEntity(m_World->GetParent(it->first))) {
+            return;
+        }
         glm::vec3 nextPos = Transform::AbsolutePosition(m_World, it->first);
         // Calculate velocity
         glm::vec3 velocity = glm::vec3(nextPos - previousPos) / (float)dt;
@@ -135,6 +143,10 @@ void SoundManager::updateListener(double dt)
     }
     for (auto it = listenerComponents->begin(); it != listenerComponents->end(); it++) {
         EntityWrapper listener(m_World, (*it).EntityID);
+        if (!listener.Valid())
+        {
+            break;
+        }
         if (listener.IsChildOf(m_LocalPlayer) || listener == m_LocalPlayer) {
             glm::vec3 previousPos;
             alGetListener3f(AL_POSITION, &previousPos.x, &previousPos.y, &previousPos.z); // Get previous pos
@@ -228,7 +240,11 @@ bool SoundManager::OnContinueSound(const Events::ContinueSound & e)
 bool SoundManager::OnPlayBackgroundMusic(const Events::PlayBackgroundMusic & e)
 {
     auto listenerComponents = m_World->GetComponents("Listener");
+    LOG_INFO("SIZZE:    %i", listenerComponents->size());
     for (auto it = listenerComponents->begin(); it != listenerComponents->end(); it++) {
+        if((*it).EntityID != m_LocalPlayer.ID) {
+            break;
+        }
         auto emitterChild = m_World->CreateEntity((*it).EntityID);
         auto emitter = m_World->AttachComponent(emitterChild, "SoundEmitter");
         (bool&)emitter["Loop"] = false;
diff --git a/src/Game/Systems/SoundSystem.cpp b/src/Game/Systems/SoundSystem.cpp
index 555e7ff0..8315160c 100644
--- a/src/Game/Systems/SoundSystem.cpp
+++ b/src/Game/Systems/SoundSystem.cpp
@@ -3,7 +3,7 @@
 SoundSystem::SoundSystem(World* world, EventBroker* eventbroker)
     : System(world, eventbroker)
     , PureSystem("SoundEmitter")
-    , ImpureSystem()
+    //, ImpureSystem()
 {
     m_World = world;
     m_EventBroker = eventbroker;
@@ -12,7 +12,6 @@ SoundSystem::SoundSystem(World* world, EventBroker* eventbroker)
     EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &SoundSystem::OnDoubleJump);
     EVENT_SUBSCRIBE_MEMBER(m_EDashAbility, &SoundSystem::OnDashAbility);
     EVENT_SUBSCRIBE_MEMBER(m_EShoot, &SoundSystem::OnShoot);
-    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &SoundSystem::OnPlayerSpawned);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &SoundSystem::OnPlayerDamage);
     EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &SoundSystem::OnCaptured);
     EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &SoundSystem::OnTriggerTouch);
@@ -31,10 +30,10 @@ bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e)
     if (e.PlayerID == -1) { // Local player
         m_World->AttachComponent(e.Player.ID, "Listener");
         m_LocalPlayer = e.Player;
-        Events::PlaySoundOnEntity event;
-        event.EmitterID = createChildEmitter(m_LocalPlayer);
-        event.FilePath = "Audio/announcer/go.wav";
-        m_EventBroker->Publish(event);
+        Events::PlaySoundOnEntity go;
+        go.EmitterID = createChildEmitter(m_LocalPlayer);
+        go.FilePath = "Audio/announcer/go.wav";
+        m_EventBroker->Publish(go);
         // TEMP: starts bgm
         {
             Events::PlayBackgroundMusic ev;
@@ -131,7 +130,7 @@ bool SoundSystem::OnPlayerDeath(const Events::PlayerDeath & e)
     //if (e.PlayerID == m_LocalPlayer.ID) {
     Events::PlaySoundOnEntity ev;
     ev.EmitterID = createChildEmitter(m_LocalPlayer);
-    ev.FilePath = "Audio/die/die2.wav"; // should random between a bunch
+    ev.FilePath = "Audio/die/die2.wav"; 
     m_EventBroker->Publish(ev);
     //}
     return false;