diff --git a/src/usr.sbin/ntpd/ntp_dns.c b/src/usr.sbin/ntpd/ntp_dns.c
index 451b3589..37dea75b 100644
--- a/src/usr.sbin/ntpd/ntp_dns.c
+++ b/src/usr.sbin/ntpd/ntp_dns.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntp_dns.c,v 1.7 2015/01/13 02:28:56 bcook Exp $ */
+/*	$OpenBSD: ntp_dns.c,v 1.8 2015/01/21 03:14:10 bcook Exp $ */
 
 /*
  * Copyright (c) 2003-2008 Henning Brauer <henning@openbsd.org>
@@ -167,12 +167,12 @@ dns_dispatch_imsg(void)
 							buf = NULL;
 							break;
 						}
-					if (buf)
-						imsg_close(ibuf_dns, buf);
 				}
 				host_dns_free(hn);
 				hn = NULL;
 			}
+			if (buf)
+				imsg_close(ibuf_dns, buf);
 			break;
 		default:
 			break;
diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
index 6f85b142..c22e5b73 100644
--- a/src/usr.sbin/ntpd/ntpd.c
+++ b/src/usr.sbin/ntpd/ntpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.c,v 1.87 2015/01/19 20:47:03 bcook Exp $ */
+/*	$OpenBSD: ntpd.c,v 1.88 2015/01/21 03:14:10 bcook Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -366,12 +366,12 @@ dispatch_imsg(struct ntpd_conf *lconf)
 							buf = NULL;
 							break;
 						}
-					if (buf)
-						imsg_close(ibuf, buf);
 				}
 				host_dns_free(hn);
 				hn = NULL;
 			}
+			if (buf)
+				imsg_close(ibuf, buf);
 			break;
 		default:
 			break;