diff --git a/changelog b/changelog
index e49257630..889b1bfbe 100644
--- a/changelog
+++ b/changelog
@@ -21,4 +21,5 @@
 * Fixed RoR graph showing the wrong name in the GUI
 * Fixed polling option in RoR controllers reading dead signals
 * Fixed state change in RoR controllers not allowing repeat commands
-* Fixed blast furnace NEI handler not cycling through all valid material shapes
\ No newline at end of file
+* Fixed blast furnace NEI handler not cycling through all valid material shapes
+* Fixed RoR transmitter sending empty signals when unused mappings apply
\ No newline at end of file
diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchSender.java b/src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchSender.java
index f65dfed83..f5bb8306d 100644
--- a/src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchSender.java
+++ b/src/main/java/com/hbm/tileentity/network/TileEntityRadioTorchSender.java
@@ -28,7 +28,8 @@ public class TileEntityRadioTorchSender extends TileEntityRadioTorchBase {
 			}
 
 			if(shouldSend && !this.channel.isEmpty()) {
-				RTTYSystem.broadcast(worldObj, this.channel, this.customMap ? this.mapping[input] : (input + ""));
+				String toSend = this.customMap ? this.mapping[input] : (input + "");
+				if(toSend != null && !toSend.isEmpty()) RTTYSystem.broadcast(worldObj, this.channel, toSend);
 			}
 		}