diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index e4b24d9cb..e146a0aa6 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -334,7 +334,8 @@ void GameObject::Update(uint32 /*p_time*/)
                         Unit *caster =  owner ? owner : ok;
 
                         caster->CastSpell(ok, goInfo->trap.spellId, true, NULL, NULL, GetGUID());
-                        m_cooldownTime = time(NULL) + 4;        // 4 seconds
+                        // use template cooldown if provided
+                        m_cooldownTime = time(NULL) + (goInfo->trap.cooldown ? goInfo->trap.cooldown : uint32(4));
 
                         // count charges
                         if(goInfo->trap.charges > 0)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index be77d5e1a..57372381f 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9523"
+ #define REVISION_NR "9524"
 #endif // __REVISION_NR_H__