diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 75c3833f4..a844d6ee0 100755
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -3120,6 +3120,10 @@ void ObjectMgr::LoadPlayerInfo()
             if (sWorld.getConfig(CONFIG_UINT32_EXPANSION) < 2 && class_ == CLASS_DEATH_KNIGHT)
                 continue;
 
+            // skip expansion races if not playing with expansion
+            if (sWorld.getConfig(CONFIG_UINT32_EXPANSION) < 3 && (race == RACE_WORGEN || race == RACE_GOBLIN))
+                continue;
+
             // fatal error if no level 1 data
             if (!pInfo->levelInfo || pInfo->levelInfo[0].stats[0] == 0)
             {
diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in
index f4fa4cc5f..8330bfb4f 100644
--- a/src/mangosd/mangosd.conf.dist.in
+++ b/src/mangosd/mangosd.conf.dist.in
@@ -427,7 +427,9 @@ LogColors = ""
 #
 #    Expansion
 #        Allow server use content from expansion
-#        Default: 2 - check expansion 2 maps existence, and if client support expansion 2 and account have
+#        Default: 3 - check expansion 3 maps existence, and if client support expansion 3 and account have
+#                     expansion 3 setting then allow visit expansion 3 maps, allow create new race and class character)
+#                 2 - check expansion 2 maps existence, and if client support expansion 2 and account have
 #                     expansion 2 setting then allow visit expansion 2 maps, allow create new class character)
 #                 1 - check expansion 1 maps existence, and if client support expansion 1 and account have
 #                     expansion 1 setting then allow visit expansion 1 maps, allow create new races character)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 56ec76372..94c14449d 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 "12165"
+ #define REVISION_NR "12166"
 #endif // __REVISION_NR_H__