diff --git a/tools/fds/server.cpp b/tools/fds/server.cpp
index e170ac5dc66..29cc0f5e172 100644
--- a/tools/fds/server.cpp
+++ b/tools/fds/server.cpp
@@ -561,6 +561,10 @@ int fastdds_discovery_server(
         // Handle signal SIGINT for every thread
         signal(SIGINT, sigint_handler);
         signal(SIGTERM, sigint_handler);
+#ifndef _WIN32
+        signal(SIGQUIT, sigint_handler);
+        signal(SIGHUP, sigint_handler);
+#endif // ifndef _WIN32
 
         bool has_security = false;
         if (guid_prefix != pServer->guid().guidPrefix)