diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index 0f7012e203..9e748aa7e2 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -2003,7 +2003,8 @@ void GameObject::Use(Unit* user)
 
             // cast this spell later if provided
             spellId = info->goober.spellId;
-            spellCaster = nullptr;
+            if (!info->goober.playerCast)
+                spellCaster = nullptr;
 
             break;
         }
diff --git a/src/server/game/Entities/GameObject/GameObjectData.h b/src/server/game/Entities/GameObject/GameObjectData.h
index 9fb44d970f..7f224e6fc4 100644
--- a/src/server/game/Entities/GameObject/GameObjectData.h
+++ b/src/server/game/Entities/GameObject/GameObjectData.h
@@ -200,6 +200,7 @@ struct GameObjectTemplate
             uint32 WorldStateSetsState;                     //20
             uint32 floatOnWater;                            //21
             uint32 conditionID1;                            //22
+            uint32 playerCast;                              //23
         } goober;
         //11 GAMEOBJECT_TYPE_TRANSPORT
         struct