diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index c472d4b69a2..333778076db 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -7245,10 +7245,10 @@ void Player::ModifyCurrency(uint32 id, int32 count, bool printLog/* = true*/, bo
 
     // Patch 4.0.3a - Justice Points over the hard cap of 4000 will be converted to 47 silver and 50 copper per point.
     uint32 surplousJusticePoints = 0;
-    if (totalCap && count > int32(totalCap))
+    if (oldTotalCount + count > int32(totalCap))
     {
         if (id = CURRENCY_TYPE_JUSTICE_POINTS)
-            surplousJusticePoints = (count - totalCap) / precision;
+            surplousJusticePoints = (oldTotalCount + count - totalCap) / precision;
         count = totalCap;
     }