diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index b13d23705..e8f2e3ab2 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -16797,8 +16797,8 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
             return false;
         }
     }
-    // node must have pos if not spell case (npc!=0)
-    else if(!spellid)
+    // node must have pos if taxi master case (npc != NULL)
+    else if (npc)
     {
         WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
         data << uint32(ERR_TAXIUNSPECIFIEDSERVERERROR);
@@ -16850,8 +16850,10 @@ bool Player::ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc
         prevnode = lastnode;
     }
 
-    uint16 mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), spellid != 0);
+    // get mount model (in case non taximaster (npc==NULL) allow more wide lookup)
+    uint16 mount_id = objmgr.GetTaxiMount(sourcenode, GetTeam(), npc == NULL);
 
+    // in spell case allow 0 model
     if (mount_id == 0 && spellid == 0 || sourcepath == 0)
     {
         WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b615e14ae..a8f60cc0f 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 "7799"
+ #define REVISION_NR "7800"
 #endif // __REVISION_NR_H__