diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java
index 9203a28a..b4eb145e 100644
--- a/src/engine/objects/PlayerCharacter.java
+++ b/src/engine/objects/PlayerCharacter.java
@@ -851,10 +851,10 @@ public class PlayerCharacter extends AbstractCharacter {
         short intMax = race.getIntMax();
         short spiMax = race.getSpiMax();
 
-        // Verify not too many runes applied
+        // 10 rune slots including race and class (client 0xBA8C80)
         int numRunes = msg.getNumRunes();
 
-        if (numRunes > 16) {
+        if (numRunes > 10) {
             Logger.info("Too many Runes applied");
             return null;
         }
@@ -936,6 +936,12 @@ public class PlayerCharacter extends AbstractCharacter {
 
             usedRunes.add(runeBase);
 
+            // Talent cap of 8 (client 0x4695D0)
+            if (usedRunes.size() > 8) {
+                Logger.info("Too many talents applied");
+                return null;
+            }
+
             int maxValue = 0;
 
             // Every attempt is made to load MIN_NEEDED_ATTRIBUTES first.