diff --git a/src/main/java/dan200/computercraft/core/apis/HTTPRequest.java b/src/main/java/dan200/computercraft/core/apis/HTTPRequest.java
index c07259d89..68177f218 100644
--- a/src/main/java/dan200/computercraft/core/apis/HTTPRequest.java
+++ b/src/main/java/dan200/computercraft/core/apis/HTTPRequest.java
@@ -231,7 +231,7 @@ public class HTTPRequest
                 }
             }
         } );
-        
+        thread.setDaemon(true);
         thread.start();
     }
     
diff --git a/src/main/java/dan200/computercraft/core/computer/ComputerThread.java b/src/main/java/dan200/computercraft/core/computer/ComputerThread.java
index 458c0e93a..c9adedc20 100644
--- a/src/main/java/dan200/computercraft/core/computer/ComputerThread.java
+++ b/src/main/java/dan200/computercraft/core/computer/ComputerThread.java
@@ -113,6 +113,7 @@ public class ComputerThread
                                 } );
                                 
                                 // Run the task
+                                worker.setDaemon(true);
                                 worker.start();
                                 worker.join( 7000 );
                                 
@@ -173,7 +174,8 @@ public class ComputerThread
                     }
                 }
             }, "Computer Dispatch Thread" );
-                
+
+            m_thread.setDaemon(true);
             m_thread.start();
             m_running = true;
         }