diff --git a/src/AvahiPoll.cxx b/src/AvahiPoll.cxx
index f3e2f596c..0d5a43dad 100644
--- a/src/AvahiPoll.cxx
+++ b/src/AvahiPoll.cxx
@@ -58,6 +58,10 @@ public:
 		Schedule(FromAvahiWatchEvent(_event));
 	}
 
+	~AvahiWatch() {
+		Steal();
+	}
+
 	static void WatchUpdate(AvahiWatch *w, AvahiWatchEvent event) {
 		w->Schedule(FromAvahiWatchEvent(event));
 	}