diff -Naur systemd-stable-245.4/src/resolve/resolved-dns-query.c systemd-stable-245.4-new/src/resolve/resolved-dns-query.c
--- systemd-stable-245.4/src/resolve/resolved-dns-query.c	2020-04-01 20:23:42.000000000 +0300
+++ systemd-stable-245.4-new/src/resolve/resolved-dns-query.c	2021-07-04 13:44:27.350718832 +0300
@@ -333,7 +333,7 @@
 
         assert(q);
 
-        q->timeout_event_source = sd_event_source_unref(q->timeout_event_source);
+        q->timeout_event_source = sd_event_source_disable_unref(q->timeout_event_source);
 
         LIST_FOREACH(candidates_by_query, c, q->candidates)
                 dns_query_candidate_stop(c);
diff -Naur systemd-stable-245.4/src/resolve/resolved-dns-scope.c systemd-stable-245.4-new/src/resolve/resolved-dns-scope.c
--- systemd-stable-245.4/src/resolve/resolved-dns-scope.c	2020-04-01 20:23:42.000000000 +0300
+++ systemd-stable-245.4-new/src/resolve/resolved-dns-scope.c	2021-07-04 13:46:46.553175107 +0300
@@ -110,9 +110,9 @@
         hashmap_free(s->transactions_by_key);
 
         ordered_hashmap_free_with_destructor(s->conflict_queue, dns_resource_record_unref);
-        sd_event_source_unref(s->conflict_event_source);
+        sd_event_source_disable_unref(s->conflict_event_source);
 
-        sd_event_source_unref(s->announce_event_source);
+        sd_event_source_disable_unref(s->announce_event_source);
 
         dns_cache_flush(&s->cache);
         dns_zone_flush(&s->zone);
@@ -998,7 +998,7 @@
         assert(es);
         assert(scope);
 
-        scope->conflict_event_source = sd_event_source_unref(scope->conflict_event_source);
+        scope->conflict_event_source = sd_event_source_disable_unref(scope->conflict_event_source);
 
         for (;;) {
                 _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL;
@@ -1204,7 +1204,7 @@
 
         assert(s);
 
-        scope->announce_event_source = sd_event_source_unref(scope->announce_event_source);
+        scope->announce_event_source = sd_event_source_disable_unref(scope->announce_event_source);
 
         (void) dns_scope_announce(scope, false);
         return 0;
diff -Naur systemd-stable-245.4/src/resolve/resolved-dns-stream.c systemd-stable-245.4-new/src/resolve/resolved-dns-stream.c
--- systemd-stable-245.4/src/resolve/resolved-dns-stream.c	2020-04-01 20:23:42.000000000 +0300
+++ systemd-stable-245.4-new/src/resolve/resolved-dns-stream.c	2021-07-04 13:47:17.928848756 +0300
@@ -17,8 +17,8 @@
 static void dns_stream_stop(DnsStream *s) {
         assert(s);
 
-        s->io_event_source = sd_event_source_unref(s->io_event_source);
-        s->timeout_event_source = sd_event_source_unref(s->timeout_event_source);
+        s->io_event_source = sd_event_source_disable_unref(s->io_event_source);
+        s->timeout_event_source = sd_event_source_disable_unref(s->timeout_event_source);
         s->fd = safe_close(s->fd);
 
         /* Disconnect us from the server object if we are now not usable anymore */
diff -Naur systemd-stable-245.4/src/resolve/resolved-dns-stub.c systemd-stable-245.4-new/src/resolve/resolved-dns-stub.c
--- systemd-stable-245.4/src/resolve/resolved-dns-stub.c	2020-04-01 20:23:42.000000000 +0300
+++ systemd-stable-245.4-new/src/resolve/resolved-dns-stub.c	2021-07-04 13:48:55.911872460 +0300
@@ -577,8 +577,8 @@
 void manager_dns_stub_stop(Manager *m) {
         assert(m);
 
-        m->dns_stub_udp_event_source = sd_event_source_unref(m->dns_stub_udp_event_source);
-        m->dns_stub_tcp_event_source = sd_event_source_unref(m->dns_stub_tcp_event_source);
+        m->dns_stub_udp_event_source = sd_event_source_disable_unref(m->dns_stub_udp_event_source);
+        m->dns_stub_tcp_event_source = sd_event_source_disable_unref(m->dns_stub_tcp_event_source);
 
         m->dns_stub_udp_fd = safe_close(m->dns_stub_udp_fd);
         m->dns_stub_tcp_fd = safe_close(m->dns_stub_tcp_fd);
diff -Naur systemd-stable-245.4/src/resolve/resolved-dns-transaction.c systemd-stable-245.4-new/src/resolve/resolved-dns-transaction.c
--- systemd-stable-245.4/src/resolve/resolved-dns-transaction.c	2020-04-01 20:23:42.000000000 +0300
+++ systemd-stable-245.4-new/src/resolve/resolved-dns-transaction.c	2021-07-04 13:49:30.055545960 +0300
@@ -59,7 +59,7 @@
                 t->stream = dns_stream_unref(t->stream);
         }
 
-        t->dns_udp_event_source = sd_event_source_unref(t->dns_udp_event_source);
+        t->dns_udp_event_source = sd_event_source_disable_unref(t->dns_udp_event_source);
         t->dns_udp_fd = safe_close(t->dns_udp_fd);
 }
 
diff -Naur systemd-stable-245.4/src/resolve/resolved-llmnr.c systemd-stable-245.4-new/src/resolve/resolved-llmnr.c
--- systemd-stable-245.4/src/resolve/resolved-llmnr.c	2020-04-01 20:23:42.000000000 +0300
+++ systemd-stable-245.4-new/src/resolve/resolved-llmnr.c	2021-07-04 13:50:08.971181526 +0300
@@ -11,16 +11,16 @@
 void manager_llmnr_stop(Manager *m) {
         assert(m);
 
-        m->llmnr_ipv4_udp_event_source = sd_event_source_unref(m->llmnr_ipv4_udp_event_source);
+        m->llmnr_ipv4_udp_event_source = sd_event_source_disable_unref(m->llmnr_ipv4_udp_event_source);
         m->llmnr_ipv4_udp_fd = safe_close(m->llmnr_ipv4_udp_fd);
 
-        m->llmnr_ipv6_udp_event_source = sd_event_source_unref(m->llmnr_ipv6_udp_event_source);
+        m->llmnr_ipv6_udp_event_source = sd_event_source_disable_unref(m->llmnr_ipv6_udp_event_source);
         m->llmnr_ipv6_udp_fd = safe_close(m->llmnr_ipv6_udp_fd);
 
-        m->llmnr_ipv4_tcp_event_source = sd_event_source_unref(m->llmnr_ipv4_tcp_event_source);
+        m->llmnr_ipv4_tcp_event_source = sd_event_source_disable_unref(m->llmnr_ipv4_tcp_event_source);
         m->llmnr_ipv4_tcp_fd = safe_close(m->llmnr_ipv4_tcp_fd);
 
-        m->llmnr_ipv6_tcp_event_source = sd_event_source_unref(m->llmnr_ipv6_tcp_event_source);
+        m->llmnr_ipv6_tcp_event_source = sd_event_source_disable_unref(m->llmnr_ipv6_tcp_event_source);
         m->llmnr_ipv6_tcp_fd = safe_close(m->llmnr_ipv6_tcp_fd);
 }
 
diff -Naur systemd-stable-245.4/src/resolve/resolved-mdns.c systemd-stable-245.4-new/src/resolve/resolved-mdns.c
--- systemd-stable-245.4/src/resolve/resolved-mdns.c	2020-04-01 20:23:42.000000000 +0300
+++ systemd-stable-245.4-new/src/resolve/resolved-mdns.c	2021-07-04 13:50:50.466801381 +0300
@@ -15,10 +15,10 @@
 void manager_mdns_stop(Manager *m) {
         assert(m);
 
-        m->mdns_ipv4_event_source = sd_event_source_unref(m->mdns_ipv4_event_source);
+        m->mdns_ipv4_event_source = sd_event_source_disable_unref(m->mdns_ipv4_event_source);
         m->mdns_ipv4_fd = safe_close(m->mdns_ipv4_fd);
 
-        m->mdns_ipv6_event_source = sd_event_source_unref(m->mdns_ipv6_event_source);
+        m->mdns_ipv6_event_source = sd_event_source_disable_unref(m->mdns_ipv6_event_source);
         m->mdns_ipv6_fd = safe_close(m->mdns_ipv6_fd);
 }