diff --git a/src/modules/Host.rb b/src/modules/Host.rb
index c7ed43d2f..fc3f8919a 100644
--- a/src/modules/Host.rb
+++ b/src/modules/Host.rb
@@ -95,13 +95,14 @@ def EnsureHostnameResolvable
 
         fqhostname = Hostname.MergeFQ(DNS.hostname, DNS.domain)
         set_names(local_ip, ["#{fqhostname} #{DNS.hostname}"])
+        @modified = true
       elsif @hosts.include_ip?(local_ip)
         # Do not add it if product default says no
         # and remove 127.0.02 entry if it exists
 
         @hosts.delete_by_ip(local_ip)
+        @modified = true
       end
-      @modified = true
 
       nil
     end
diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb
index 7477a6d17..ef543b580 100644
--- a/src/modules/Lan.rb
+++ b/src/modules/Lan.rb
@@ -558,6 +558,9 @@ def Write
       # reload/restart network before this to put correct resolv.conf from dhcp-backup
       orig = Progress.set(false)
       DNS.Write
+      # Ensure that the /etc/hosts has been read to no blank out it (bsc#1058396)
+      # The method just returns true in case of initialized.
+      Host.Read
       Host.EnsureHostnameResolvable
       Host.Write
       Progress.set(orig)