diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index f90ee921d..d596b554f 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -215,11 +215,11 @@ namespace MWClass
                     packet to do it instead
                 */
                 //ptr.getCellRef().setTrap("");
+                //MWBase::Environment::get().getSoundManager()->playSound3D(ptr, "Disarm Trap", 1.0f, 1.0f);
                 /*
                     End of tes3mp change (major)
                 */
 
-                MWBase::Environment::get().getSoundManager()->playSound3D(ptr, "Disarm Trap", 1.0f, 1.0f);
                 isTrapped = false;
 
                 /*
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 196b9e215..ea40a3189 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -197,11 +197,11 @@ namespace MWClass
                     packet to do it instead
                 */
                 //ptr.getCellRef().setTrap("");
+                //MWBase::Environment::get().getSoundManager()->playSound3D(ptr, "Disarm Trap", 1.0f, 1.0f);
                 /*
                     End of tes3mp change (major)
                 */
 
-                MWBase::Environment::get().getSoundManager()->playSound3D(ptr, "Disarm Trap", 1.0f, 1.0f);
                 isTrapped = false;
 
                 /*
diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp
index eb3f3d18f..2e677473d 100644
--- a/apps/openmw/mwmp/ObjectList.cpp
+++ b/apps/openmw/mwmp/ObjectList.cpp
@@ -615,6 +615,7 @@ void ObjectList::triggerTrapObjects(MWWorld::CellStore* cellStore)
             }
 
             ptrFound.getCellRef().setTrap("");
+            MWBase::Environment::get().getSoundManager()->playSound3D(ptrFound, "Disarm Trap", 1.0f, 1.0f);
         }
     }
 }