1 files changed, 9 insertions, 1 deletions
diff --git a/conf/conf.c b/conf/conf.c
index b21d5213..4e0e6e04 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -282,7 +282,15 @@ static void
 config_done(void *unused UNUSED)
 {
   if (config->shutdown)
-    sysdep_shutdown_done();
+    {
+      /* Clean up from bt-utils.c */
+      for (int i = 0; i < PROTOCOL__MAX; i++)
+        class_to_protocol[i] = NULL;
+
+      config = new_config = NULL;
+
+      sysdep_shutdown_done();
+    }
 
   configuring = 0;
   if (old_config)