diff --git a/PrinterEmulator/Emulator.cs b/PrinterEmulator/Emulator.cs
index b2bb77391..a54010d9e 100644
--- a/PrinterEmulator/Emulator.cs
+++ b/PrinterEmulator/Emulator.cs
@@ -625,16 +625,21 @@ namespace MatterHackers.PrinterEmulator
 				{
 					if (receiveQueue.Count == 0)
 					{
-						receiveResetEvent.WaitOne();
-					}
+						if (shuttingDown)
+						{
+							return;
+						}
 
-					if (shuttingDown)
-					{
-						return;
+						receiveResetEvent.WaitOne();
 					}
 
 					if (receiveQueue.Count == 0)
 					{
+						if (shuttingDown)
+						{
+							return;
+						}
+
 						Thread.Sleep(10);
 					}
 					else