diff --git a/data/sql/updates/pending_db_world/rev_1639429050892480400.sql b/data/sql/updates/pending_db_world/rev_1639429050892480400.sql
new file mode 100644
index 000000000..cbb15ce10
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1639429050892480400.sql
@@ -0,0 +1,5 @@
+INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1639429050892480400');
+
+DELETE FROM `gameobject_template_addon` WHERE `entry`=195089;
+INSERT INTO `gameobject_template_addon` VALUES
+(195089,35,0,0,0);
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index fad53f256..cd8ed7369 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -681,7 +681,7 @@ void GameObject::Update(uint32 diff)
 
                         // Note: this hack with search required until GO casting not implemented
                         // search unfriendly creature
-                        if (owner)                    // hunter trap
+                        if (owner && goInfo->trap.autoCloseTime != -1) // hunter trap
                         {
                             Acore::AnyUnfriendlyNoTotemUnitInObjectRangeCheck checker(this, owner, radius);
                             Acore::UnitSearcher<Acore::AnyUnfriendlyNoTotemUnitInObjectRangeCheck> searcher(this, target, checker);