diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7a10f8f739f163bc02f0b094faee08f9e5c6f996..01929c28165e6859e53aa8b22179000d3c6c27f2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -22967,14 +22967,14 @@ qemuDomainGetGuestInfo(virDomainPtr dom,
     }
     if (supportedTypes & VIR_DOMAIN_GUEST_INFO_HOSTNAME) {
         rc = qemuAgentGetHostname(agent, &hostname);
-        if (rc < 0 && !(rc == -2 && types == 0)) {
+        if (rc < 0 && !(rc == -2 && types == 0))
             goto exitagent;
-        } else {
-            if (virTypedParamsAddString(params, nparams, &maxparams, "hostname",
-                                        hostname) < 0)
-                goto exitagent;
-        }
     }
+
+    if (hostname &&
+        virTypedParamsAddString(params, nparams, &maxparams, "hostname", hostname) < 0)
+        goto exitagent;
+
     if (supportedTypes & VIR_DOMAIN_GUEST_INFO_FILESYSTEM) {
         rc = qemuAgentGetFSInfo(agent, &agentfsinfo);
         if (rc < 0) {