diff --git a/data/sql/updates/pending_db_world/rev_1498835613715251400.sql b/data/sql/updates/pending_db_world/rev_1498835613715251400.sql
new file mode 100644
index 000000000..42fa8fbaf
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1498835613715251400.sql
@@ -0,0 +1,3 @@
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1498835613715251400');
+
+UPDATE `creature_template` SET `modelid1` = '6485' WHERE `entry` = '7780'; 
diff --git a/src/scripts/EasternKingdoms/zone_hinterlands.cpp b/src/scripts/EasternKingdoms/zone_hinterlands.cpp
index 751acb721..a09f7df1b 100644
--- a/src/scripts/EasternKingdoms/zone_hinterlands.cpp
+++ b/src/scripts/EasternKingdoms/zone_hinterlands.cpp
@@ -170,6 +170,7 @@ public:
         {
             _IsByOutrunner = false;
             spawnId = 0;
+            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE);
         }
 
         void Reset()
@@ -228,6 +229,7 @@ public:
 
         void sQuestAccept(Player* player, Quest const* quest)
         {
+            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE);
             if (quest->GetQuestId() == QUEST_RINJI_TRAPPED)
             {
                 if (GameObject* go = me->FindNearestGameObject(GO_RINJI_CAGE, INTERACTION_DISTANCE))