diff --git a/components/openmw-mp/Base/BasePlayer.hpp b/components/openmw-mp/Base/BasePlayer.hpp
index 18106a496..6660bcbfc 100644
--- a/components/openmw-mp/Base/BasePlayer.hpp
+++ b/components/openmw-mp/Base/BasePlayer.hpp
@@ -9,6 +9,7 @@
 #include <components/esm/loadcell.hpp>
 #include <components/esm/loadnpc.hpp>
 #include <components/esm/creaturestats.hpp>
+#include <components/esm/loadclas.hpp>
 #include <RakNetTypes.h>
 
 namespace mwmp
@@ -142,6 +143,7 @@ namespace mwmp
         }
         RakNet::RakNetGUID guid;
         GUIMessageBox guiMessageBox;
+        ESM::Class klass;
 
     protected:
         ESM::Position pos;
diff --git a/components/openmw-mp/Packets/PacketClass.cpp b/components/openmw-mp/Packets/PacketClass.cpp
index 7f3c91487..49f123c53 100644
--- a/components/openmw-mp/Packets/PacketClass.cpp
+++ b/components/openmw-mp/Packets/PacketClass.cpp
@@ -15,9 +15,7 @@ void mwmp::PacketClass::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player,
     BasePacket::Packet(bs, player, send);
 
     RW(player->klass.mId, send);
-    RW(player->customClass, send);
-
-    if(player->customClass)
+    if(player->klass.mId.empty()) // custom class
     {
         RW(player->klass.mName, send);
         RW(player->klass.mDescription, send);