diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index 5c4c7da241..7e3f9b8a1e 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -58,17 +58,17 @@
   category: Engineering
   group: market
 
-- type: cargoProduct
-  name: "emitter crate"
-  id: EngineSingularityEmitter
-  description: "Contains an emitter. Used only for dangerous applications."
-  icon:
-    sprite: Structures/Power/Generation/Singularity/emitter.rsi
-    state: emitter2
-  product: CrateEngineeringSingularityEmitter
-  cost: 3000
-  category: Engineering
-  group: market
+#- type: cargoProduct
+#  name: "emitter crate"
+#  id: EngineSingularityEmitter
+#  description: "Contains an emitter. Used only for dangerous applications."
+#  icon:
+#    sprite: Structures/Power/Generation/Singularity/emitter.rsi
+#    state: emitter2
+#  product: CrateEngineeringSingularityEmitter
+#  cost: 3000
+#  category: Engineering
+#  group: market
 
 - type: cargoProduct
   name: "radiation collector crate"
diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
index 562baaa0e4..86c5f8216c 100644
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -273,6 +273,7 @@
     - FlashlightLantern
     - FireExtinguisher
     - AutolatheMachineCircuitboard
+    - EmitterCircuitboard
     - ProtolatheMachineCircuitboard
     - OreProcessorMachineCircuitboard
     - CircuitImprinterMachineCircuitboard
diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 8474c4b30f..620f6613ce 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -396,6 +396,20 @@
       materialRequirements:
         Glass: 2
         Cable: 2
+        
+- type: entity
+  id: EmitterCircuitboard
+  parent: BaseMachineCircuitboard
+  name: emitter machine board
+  components:
+    - type: MachineBoard
+      prototype: Emitter
+      requirements:
+        Capacitor: 1
+        Laser: 1
+      materialRequirements:
+        CableHV: 5
+        Glass: 2
 
 - type: entity
   id: SurveillanceCameraRouterCircuitboard
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index f965fc9c35..ece4e2d167 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -71,3 +71,8 @@
     locked: false
   - type: AccessReader
     access: [[ "Engineering" ]]
+  - type: Construction
+    graph: Machine
+    node: machine
+  - type: Machine
+    board: EmitterCircuitboard
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml
index 00fc668b41..9eccf9ca47 100644
--- a/Resources/Prototypes/Recipes/Lathes/electronics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml
@@ -357,3 +357,12 @@
   materials:
     Steel: 100
     Glass: 900
+    
+- type: latheRecipe
+  id: EmitterCircuitboard
+  icon: Objects/Misc/module.rsi/id_mod.png
+  result: EmitterCircuitboard
+  completetime: 4
+  materials:
+    Steel: 100
+    Glass: 900