diff --git a/src/resolve/resolv.conf b/src/resolve/resolv.conf
index dc5ac05532..b4e9a96b35 100644
--- a/src/resolve/resolv.conf
+++ b/src/resolve/resolv.conf
@@ -16,3 +16,4 @@
 
 nameserver 127.0.0.53
 options edns0 trust-ad
+search .
diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index 0de5046367..7f48c0b9a7 100644
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -271,7 +271,10 @@ static int write_uplink_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSe
                         write_resolv_conf_server(s, f, &count);
         }
 
-        if (!ordered_set_isempty(domains))
+        if (ordered_set_isempty(domains))
+                fputs("search .", f); /* Make sure that if the local hostname is chosen as fqdn this does not
+                                       * imply a search domain */
+        else
                 write_resolv_conf_search(domains, f);
 
         return fflush_and_check(f);
@@ -297,7 +300,10 @@ static int write_stub_resolv_conf_contents(FILE *f, OrderedSet *dns, OrderedSet
               "nameserver 127.0.0.53\n"
               "options edns0 trust-ad\n", f);
 
-        if (!ordered_set_isempty(domains))
+        if (ordered_set_isempty(domains))
+                fputs("search .", f); /* Make sure that if the local hostname is chosen as fqdn this does not
+                                       * imply a search domain */
+        else
                 write_resolv_conf_search(domains, f);
 
         return fflush_and_check(f);