diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 186ca32a3..eb6be05e5 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -11316,9 +11316,9 @@ void Player::ApplyEnchantment(Item *item,EnchantmentSlot slot,bool apply, bool a
                 {
                     if(apply)
                     {
-                        int32 basepoints = int32(enchant_amount);
+                        int32 basepoints = 0;
                         // Random Property Exist - try found basepoints for spell (basepoints depends from item suffix factor)
-                        if (item->GetItemRandomPropertyId() !=0 && !enchant_amount)
+                        if (item->GetItemRandomPropertyId())
                         {
                             ItemRandomSuffixEntry const *item_rand = sItemRandomSuffixStore.LookupEntry(abs(item->GetItemRandomPropertyId()));
                             if (item_rand)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 8d02552b4..73958c37a 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 "6917"
+ #define REVISION_NR "6918"
 #endif // __REVISION_NR_H__