diff --git a/gradle.properties b/gradle.properties
index 1581add..14c31c5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,8 +4,8 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
 loader_version=0.16.14
 loom_version=1.11-SNAPSHOT
 
@@ -15,4 +15,4 @@ maven_group=io.nihlen.scriptschunkloaders
 archives_base_name=scripts-chunk-loaders
 
 # Dependencies
-fabric_version=0.119.3+1.21.4
+fabric_version=0.128.1+1.21.5
diff --git a/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java
index fbbf90a..9351e5c 100644
--- a/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java
+++ b/src/main/java/io/nihlen/scriptschunkloaders/mixin/AbstractMinecartEntityMixin.java
@@ -104,7 +104,7 @@ public void writeCustomDataToNbt(NbtCompound nbt, CallbackInfo ci) {
 
 	@Inject(method = "readCustomDataFromNbt", at = @At("RETURN"))
 	public void readCustomDataFromNbt(NbtCompound nbt, CallbackInfo ci) {
-		this.isChunkLoader = nbt.getBoolean("chunkLoader");
+		this.isChunkLoader = nbt.getBoolean("chunkLoader").orElse(false);
 	}
 
 	@Inject(method = "tick", at = @At("TAIL"))
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 0047075..314a555 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -24,7 +24,7 @@
 	],
 	"depends": {
 		"fabricloader": ">=0.16.14",
-		"minecraft": "1.21.4",
+		"minecraft": "1.21.5",
 		"java": ">=21",
 		"fabric-api": "*"
 	}