diff --git a/nms-patches/TileEntitySign.patch b/nms-patches/TileEntitySign.patch
index 49ebfd13e9..dc61748c51 100644
--- a/nms-patches/TileEntitySign.patch
+++ b/nms-patches/TileEntitySign.patch
@@ -107,3 +107,12 @@
      }
  
      public EnumColor getColor() {
+@@ -126,7 +178,7 @@
+         if (enumcolor != this.getColor()) {
+             this.color = enumcolor;
+             this.update();
+-            this.world.notify(this.getPosition(), this.getBlock(), this.getBlock(), 3);
++            if (this.world != null) this.world.notify(this.getPosition(), this.getBlock(), this.getBlock(), 3); // CraftBukkit - skip notify if world is null (SPIGOT-5122)
+             return true;
+         } else {
+             return false;