diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java b/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
index 6c672c59ed6..4d480bc2f9d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
@@ -93,7 +93,9 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 						instance.setBaseValue(0);
 						break;
 					case RESET:
-						instance.setBaseValue(instance.getDefaultValue());
+						AttributeInstance defaultValue = entity.getType().getDefaultAttributes().getAttribute(attribute);
+						if (defaultValue != null)
+							instance.setBaseValue(defaultValue.getBaseValue());
 						break;
 					case REMOVE:
 						instance.setBaseValue(instance.getBaseValue() - deltaValue);