diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java b/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
index 1f2a28a30a..9933b9fe5b 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
+++ b/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
@@ -152,6 +152,7 @@ public class AVMRemoteTransportService implements AVMRemoteTransport, Runnable
     public void init()
     {
         fThread = new Thread(this);
+        fThread.setDaemon(true);
         fDone = false;
         fThread.start();
     }