diff --git a/Resources/Prototypes/Entities/Buildings/instruments.yml b/Resources/Prototypes/Entities/Buildings/instruments.yml
index b5c0f615de..b020d4cfc3 100644
--- a/Resources/Prototypes/Entities/Buildings/instruments.yml
+++ b/Resources/Prototypes/Entities/Buildings/instruments.yml
@@ -56,6 +56,21 @@
      sprite: Objects/Instruments/otherinstruments.rsi
      state: minimoog
 
+ - type: entity
+   name: church organ
+   parent: BaseInstrument
+   id: ChurchOrganInstrument
+   description: This thing really blows!
+   components:
+   - type: Instrument
+     program: 20
+   - type: Sprite
+     sprite: Objects/Instruments/otherinstruments.rsi
+     state: church_organ
+   - type: Icon
+     sprite: Objects/Instruments/otherinstruments.rsi
+     state: church_organ
+
  - type: entity
    name: xylophone
    parent: BaseInstrument
diff --git a/Resources/Textures/Objects/Instruments/otherinstruments.rsi/church_organ.png b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/church_organ.png
new file mode 100644
index 0000000000..5796441307
Binary files /dev/null and b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/church_organ.png differ
diff --git a/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json
index efd96412ac..f41805a8ea 100644
--- a/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json
+++ b/Resources/Textures/Objects/Instruments/otherinstruments.rsi/meta.json
@@ -79,6 +79,24 @@
         ]
       ]
     },
+    {
+      "name": "church_organ",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
     {
       "name": "piano",
       "directions": 4,