diff --git a/Server/main.c b/Server/main.c
index 8402590..eac830b 100644
--- a/Server/main.c
+++ b/Server/main.c
@@ -144,9 +144,6 @@ int startup(int argc, char** argv) {
 #ifndef __MINGW32__
 	signal(SIGCHLD, SIG_IGN);
 	signal(SIGPIPE, SIG_IGN);
-#ifdef __HAIKU__
-	signal(5, SIG_IGN);
-#endif
 #else
 	SetConsoleTitle(tw_server);
 #endif
diff --git a/Server/server.c b/Server/server.c
index a395104..cd7a2d5 100644
--- a/Server/server.c
+++ b/Server/server.c
@@ -831,7 +831,11 @@ void tw_server_loop(void) {
 						int j;
 						for(j = 0; j < sockcount; j++) close_socket(sockets[j]);
 						tw_server_pass(sock, config.ports[i] & (1ULL << 32), config.ports[i], claddr);
+#ifdef __HAIKU__
+						while(1);
+#else
 						_exit(0);
+#endif
 					} else {
 						close_socket(sock);
 					}