diff --git a/Servers/TTYServer/main.cpp b/Servers/TTYServer/main.cpp
index f16c226c6d..d26fb938cb 100644
--- a/Servers/TTYServer/main.cpp
+++ b/Servers/TTYServer/main.cpp
@@ -1,5 +1,8 @@
+#include <AK/Assertions.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/wait.h>
+#include <unistd.h>
 
 int main(int argc, char** argv)
 {
@@ -10,7 +13,17 @@ int main(int argc, char** argv)
 
     while (true) {
         dbgprintf("Running shell on %s\n", argv[1]);
-        int rc = system("/bin/Shell");
-        dbgprintf("Shell on %s exited with code %d\n", argv[1], rc);
+
+        auto child = fork();
+        if (!child) {
+            int rc = execl("/bin/Shell", "Shell", nullptr);
+            ASSERT(rc < 0);
+            perror("execl");
+            exit(127);
+        } else {
+            int wstatus;
+            waitpid(child, &wstatus, 0);
+            dbgprintf("Shell on %s exited with code %d\n", argv[1], WEXITSTATUS(wstatus));
+        }
     }
 }