diff --git a/tools/qwaq/qwaq-bi.c b/tools/qwaq/qwaq-bi.c
index 822c8c635..918dfbd28 100644
--- a/tools/qwaq/qwaq-bi.c
+++ b/tools/qwaq/qwaq-bi.c
@@ -151,6 +151,14 @@ static builtin_t builtins[] = {
 	{0}
 };
 
+static void
+bi_shutdown (void)
+{
+	S_Shutdown ();
+	IN_Shutdown ();
+	VID_Shutdown ();
+}
+
 void
 BI_Init (progs_t *pr)
 {
@@ -162,6 +170,8 @@ BI_Init (progs_t *pr)
 	PI_Init ();
 	PI_RegisterPlugins (client_plugin_list);
 
+	Sys_RegisterShutdown (bi_shutdown);
+
 	VID_Init_Cvars ();
 	IN_Init_Cvars ();
 	Mod_Init_Cvars ();