diff --git a/rpitx.py b/rpitx.py
index d23bcada..467d047f 100644
--- a/rpitx.py
+++ b/rpitx.py
@@ -262,8 +262,7 @@ if __name__ == "__main__":
 	
 	system("echo 'hi hi de " + callsign + "' > id.txt && gen_packets -M 20 /home/pi/CubeSatSim/id.txt -o /home/pi/CubeSatSim/morse.wav -r 48000 > /dev/null 2>&1")	
 	
-#	if (mode != 'a'):
-	if (command_tx == True):	
+	if (mode != 'a') and (command_tx == True):	
 		output(pd, 1)
 		output (ptt, 0)
 		output(txLed, txLedOn)
@@ -283,7 +282,7 @@ if __name__ == "__main__":
 		output(pd, 0)
 		sleep(1)
 	else:
-		print("Don't transmit CW ID since command_tx is False")
+		print("Don't transmit CW ID since command_tx is False or APRS mode")
 
 	if (transmit):