diff --git a/src/backend/TcpUploader.scala b/src/backend/TcpUploader.scala
index e52d881..2f5d82f 100644
--- a/src/backend/TcpUploader.scala
+++ b/src/backend/TcpUploader.scala
@@ -38,7 +38,9 @@ class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsIsUpl
 	}
 
 	def stop() {
-		conn.running = false
+		conn.synchronized {
+			conn.running = false
+		}
 		conn.shutdown()
 		conn.interrupt()
 		conn.join()