diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt
index 17585936e..819864908 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt
@@ -34,7 +34,7 @@ class FluidTankBlockEntity(blockPos: BlockPos, blockState: BlockState) : Mattery
 		if (level is ServerLevel) {
 			markDirtyFast()
 		}
-	}), FluidStack.STREAM_CODEC.wrap()))
+	}), FluidStack.OPTIONAL_STREAM_CODEC.wrap()))
 
 	val fillInput = MatteryContainer(::markDirtyFast, 1).also(::addDroppableContainer)
 	val drainInput = MatteryContainer(::markDirtyFast, 1).also(::addDroppableContainer)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt
index f2ac59c5a..9e77de59c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/fluid/BlockMatteryFluidHandler.kt
@@ -26,7 +26,7 @@ open class BlockMatteryFluidHandler(private val _capacity: IntSupplier, field: D
 		get() = _capacity.asInt
 
 	override fun serializeNBT(registry: HolderLookup.Provider): Tag {
-		return fluid.save(registry)
+		return fluid.saveOptional(registry)
 	}
 
 	override fun deserializeNBT(registry: HolderLookup.Provider, nbt: Tag?) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/FluidGaugeWidget.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/FluidGaugeWidget.kt
index 35585af95..d9e864b0b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/FluidGaugeWidget.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/widget/FluidGaugeWidget.kt
@@ -17,7 +17,7 @@ class FluidGaugeWidget(synchronizer: SynchableGroup) {
 	var fluidSupplier = Supplier { FluidStack.EMPTY }
 
 	val maxCapacity by synchronizer.computedInt(IntSupplier { maxCapacitySupplier.asInt })
-	val fluid by synchronizer.computed({ fluidSupplier.get() }, FluidStack.STREAM_CODEC.wrap())
+	val fluid by synchronizer.computed({ fluidSupplier.get() }, FluidStack.OPTIONAL_STREAM_CODEC.wrap())
 
 	val percentage: Float get() {
 		if (maxCapacity <= 0 || fluid.isEmpty) {