diff --git a/src/ConnDis.c b/src/ConnDis.c
index d40bab08..f32b0925 100644
--- a/src/ConnDis.c
+++ b/src/ConnDis.c
@@ -407,6 +407,7 @@ _X11TransConnectDisplay (
     if (reset_hostname && (phostname != original_hostname)) {
 	Xfree (phostname);
 	phostname = original_hostname;
+	original_hostname = NULL;
     }
 #endif
     len = ((phostname ? strlen(phostname) : 0) + 1 + (dnet ? 1 : 0) +