diff --git a/src/backend/TcpUploader.scala b/src/backend/TcpUploader.scala
index d4b876a..0c56f86 100644
--- a/src/backend/TcpUploader.scala
+++ b/src/backend/TcpUploader.scala
@@ -45,7 +45,7 @@ class TcpUploader(service : AprsService, prefs : PrefsWrapper) extends AprsIsUpl
 		}
 		conn.shutdown()
 		conn.interrupt()
-		conn.join()
+		conn.join(50)
 	}
 
 	class TcpSocketThread(host : String, port : Int)