diff --git a/src/main/java/dev/rvbsm/fsit/mixin/AreaEffectCloudEntityMixin.java b/src/main/java/dev/rvbsm/fsit/mixin/AreaEffectCloudEntityMixin.java
index 30550971..e7b92e08 100644
--- a/src/main/java/dev/rvbsm/fsit/mixin/AreaEffectCloudEntityMixin.java
+++ b/src/main/java/dev/rvbsm/fsit/mixin/AreaEffectCloudEntityMixin.java
@@ -19,6 +19,7 @@ public AreaEffectCloudEntityMixin(EntityType<?> type, World world) {
 
 	@Inject(method = "tick", at = @At("TAIL"))
 	private void tick$cleanSit(CallbackInfo ci) {
-		if (this.age > 20 && !this.hasPassengers() && this.getCustomName() == SeatEntity.CUSTOM_NAME) this.discard();
+		if (this.age > 20 && !this.hasPassengers() && this.getCustomName() != null && this.getCustomName().equals(SeatEntity.CUSTOM_NAME))
+			this.discard();
 	}
 }