diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp
index 007862d..fff8e01 100644
--- a/src/modules/sni/host.cpp
+++ b/src/modules/sni/host.cpp
@@ -22,10 +22,6 @@ Host::~Host() {
     Gio::DBus::unwatch_name(bus_name_id_);
     bus_name_id_ = 0;
   }
-  if (watcher_id_ > 0) {
-    Gio::DBus::unwatch_name(watcher_id_);
-    watcher_id_ = 0;
-  }
   g_cancellable_cancel(cancellable_);
   g_clear_object(&cancellable_);
   g_clear_object(&watcher_);
diff --git a/src/modules/sni/watcher.cpp b/src/modules/sni/watcher.cpp
index 34bcef6..6881677 100644
--- a/src/modules/sni/watcher.cpp
+++ b/src/modules/sni/watcher.cpp
@@ -14,12 +14,7 @@ Watcher::Watcher()
       watcher_(sn_watcher_skeleton_new()) {}
 
 Watcher::~Watcher() {
-  if (hosts_ != nullptr) {
-    g_slist_free_full(hosts_, gfWatchFree);
-    hosts_ = nullptr;
-  }
-
-  if (items_ != nullptr) {
+   if (items_ != nullptr) {
     g_slist_free_full(items_, gfWatchFree);
     items_ = nullptr;
   }