diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 36af80435..601d7d6bf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ guava = "31.0.1-jre"
 gson = "2.8.8"
 
 # Platform expectations
-paper = "1.18-rc3-R0.1-SNAPSHOT"
+paper = "1.18-R0.1-SNAPSHOT"
 
 # Plugins
 vault = "1.7.1"
diff --git a/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts
index ad9b832c6..c1f95639f 100644
--- a/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts
+++ b/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts
@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    paperDevBundle("1.18-rc3-R0.1-20211129.221606-5")
+    paperDevBundle("1.18-rc3-R0.1-20211129.221606-5") //TODO 1.18 switch to mainline
     compileOnly(libs.paperlib)
     compileOnly(libs.paper)
 }
diff --git a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R1/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R1/PaperweightAdapter.java
index 973e38d3e..a8ce1e036 100644
--- a/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R1/PaperweightAdapter.java
+++ b/worldedit-bukkit/adapters/adapter-1_18/src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_18_R1/PaperweightAdapter.java
@@ -186,7 +186,7 @@ public final class PaperweightAdapter implements BukkitImplAdapter {
         CraftServer.class.cast(Bukkit.getServer());
 
         int dataVersion = CraftMagicNumbers.INSTANCE.getDataVersion();
-        if (dataVersion != 2858) { // 1.18 release should be 2859
+        if (dataVersion != 2860) {
             throw new UnsupportedClassVersionError("Not 1.18!");
         }