diff --git a/patches/server/Properly-cancel-bed-block-placement.patch b/patches/server/Properly-cancel-bed-block-placement.patch
new file mode 100644
index 0000000000..206515b7e6
--- /dev/null
+++ b/patches/server/Properly-cancel-bed-block-placement.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Sun, 26 Mar 2023 13:17:41 -0700
+Subject: [PATCH] Properly cancel bed block placement
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/level/block/BedBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java
+@@ -0,0 +0,0 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock
+ 
+             world.setBlock(blockposition1, (BlockState) state.setValue(BedBlock.PART, BedPart.HEAD), 3);
+             world.blockUpdated(pos, Blocks.AIR);
+-            state.updateNeighbourShapes(world, pos, 3);
++            // state.updateNeighbourShapes(world, pos, 3); // Paper - shapes will be updated on successful block place
+         }
+ 
+     }
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 93813509b6..f92c945173 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 93813509b6dd3476419a5344b252aa1867960090
+Subproject commit f92c945173a83c754203f372cb0111780c24b540