diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb7d5d3..d2f87d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@ X changes total
 
 ## [Unreleased]
 
+### Added
+
+- **This update brings experimental Spigot 1.17 support.**
+
 ### Changes
 
 - This version requires at least Mimic 0.6.1
diff --git a/src/main/java/ru/endlesscode/rpginventory/compat/VersionHandler.java b/src/main/java/ru/endlesscode/rpginventory/compat/VersionHandler.java
index 53f8a0e..852a923 100644
--- a/src/main/java/ru/endlesscode/rpginventory/compat/VersionHandler.java
+++ b/src/main/java/ru/endlesscode/rpginventory/compat/VersionHandler.java
@@ -38,17 +38,18 @@ public class VersionHandler {
     public static final int VERSION_1_15 = 1_15_00;
     public static final int VERSION_1_16 = 1_16_00;
     public static final int VERSION_1_17 = 1_17_00;
+    public static final int VERSION_1_18 = 1_18_00;
 
     private static final Pattern pattern = Pattern.compile("(?<version>\\d\\.\\d{1,2}(\\.\\d)?)-.*");
 
     private static int versionCode = -1;
 
     public static boolean isNotSupportedVersion() {
-        return getVersionCode() < VERSION_1_14 || getVersionCode() >= VERSION_1_17;
+        return getVersionCode() < VERSION_1_14 || getVersionCode() >= VERSION_1_18;
     }
 
     public static boolean isExperimentalSupport() {
-        return false;
+        return getVersionCode() == VERSION_1_17;
     }
 
     public static boolean isLegacy() {