diff --git a/apps/libhn70ap/Kconfig b/apps/libhn70ap/Kconfig
index 82dca5023d60693d0a1a7945bb2b690af77e6594..7a09cae4d354026c0da849f1089725c4d669c3aa 100644
--- a/apps/libhn70ap/Kconfig
+++ b/apps/libhn70ap/Kconfig
@@ -5,4 +5,4 @@
 
 config LIBHN70AP
 	bool "Common Library"
-	default y
+	default n
diff --git a/apps/sysdaemon/sysdaemon_netmonitor.c b/apps/sysdaemon/sysdaemon_netmonitor.c
index fb34906376c97a8e698526929f0b125f622fb532..ec4d8727acd7520a5ce1f66ced48979d772d9ebe 100644
--- a/apps/sysdaemon/sysdaemon_netmonitor.c
+++ b/apps/sysdaemon/sysdaemon_netmonitor.c
@@ -192,6 +192,7 @@ static void* netmonitor_thread(void *arg)
   struct timespec reltime;
   struct ifreq ifr;
   struct sigaction act;
+  struct sigaction oact;
   bool devup;
   int ret;
   int sd;
@@ -221,7 +222,7 @@ static void* netmonitor_thread(void *arg)
   act.sa_sigaction = netmonitor_signal;
   act.sa_flags     = SA_SIGINFO;
 
-  ret = sigaction(SIGUSR2, &act, NULL);
+  ret = sigaction(SIGUSR2, &act, &oact);
   if (ret < 0)
     {
       ret = -errno;
@@ -394,7 +395,7 @@ static void* netmonitor_thread(void *arg)
 errout_with_notification:
 #  warning Missing logic
 errout_with_sigaction:
-#  warning Missing logic
+  (void)sigaction(SIGUSR2, &oact, NULL);
 errout_with_socket:
   close(sd);
 errout: