diff --git a/item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTCompound.java b/item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTCompound.java
index 389180fa0..f622cf126 100644
--- a/item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTCompound.java
+++ b/item-nbt-api/src/main/java/de/tr7zw/changeme/nbtapi/NBTCompound.java
@@ -856,8 +856,8 @@ public NBTCompoundList getCompoundList(String name) {
      * Returns the stored value if exists, or provided value otherwise.
      * <p>
      * Supported types:
-     * {@code byte/Byte, short/Short, int/Integer, long/Long, float/Float, double/Double, byte[], int[]},
-     * {@link String}, {@link UUID}
+     * {@code Boolean, Byte, Short, Integer, Long, Float, Double, byte[], int[]},
+     * {@link String}, {@link UUID}, and {@link Enum}
      *
      * @param key          key
      * @param defaultValue default non-null value
@@ -873,6 +873,8 @@ public <T> T getOrDefault(String key, T defaultValue) {
             return defaultValue;
 
         Class<?> clazz = defaultValue.getClass();
+        if (clazz == Boolean.class)
+            return (T) getBoolean(key);
         if (clazz == Byte.class)
             return (T) getByte(key);
         if (clazz == Short.class)
@@ -908,13 +910,13 @@ public <T> T getOrDefault(String key, T defaultValue) {
      * Returns the stored value if exists, or null.
      * <p>
      * Supported types:
-     * {@code Byte, Short, Integer, Long, Float, Double, byte[], int[]},
-     * {@link String}, {@link UUID}
+     * {@code Boolean, Byte, Short, Integer, Long, Float, Double, byte[], int[]},
+     * {@link String}, {@link UUID}, and {@link Enum}
      *
      * @param key  key
      * @param type data type
      * @param <T>  value type
-     * @return Stored or provided value
+     * @return Stored value or null
      */
     @Override
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -924,6 +926,8 @@ public <T> T getOrNull(String key, Class<?> type) {
         if (!hasTag(key))
             return null;
 
+        if (type == Boolean.class)
+            return (T) getBoolean(key);
         if (type == Byte.class)
             return (T) getByte(key);
         if (type == Short.class)