diff --git a/gradle.properties b/gradle.properties
index 4d5dda7eb..4dbfc1daf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 mod_version=1.99.0
 
 # Minecraft properties (update mods.toml when changing)
-mc_version=1.18
+mc_version=1.18.1
 mapping_version=2021.09.05
-forge_version=38.0.0
+forge_version=39.0.0
 # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
index 9f96227cc..0d1e54205 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
@@ -140,13 +140,6 @@ public class TileMonitor extends TileGeneric
     @Override
     public void load( @Nonnull CompoundTag nbt )
     {
-        if( level != null && level.isClientSide )
-        {
-            // TODO: Remove once https://github.com/MinecraftForge/MinecraftForge/pull/8237 is merged.
-            handleUpdateTag( nbt );
-            return;
-        }
-
         super.load( nbt );
 
         xIndex = nbt.getInt( NBT_X );
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 12de56943..baa4deffe 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[38,39)"
+loaderVersion="[39,40)"
 
 issueTrackerURL="https://github.com/cc-tweaked/CC-Tweaked/issues"
 logoFile="pack.png"
@@ -21,6 +21,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
 [[dependencies.computercraft]]
     modId="forge"
     mandatory=true
-    versionRange="[38.0.0,39)"
+    versionRange="[39.0.0,40)"
     ordering="NONE"
     side="BOTH"