diff --git a/doc/Changelog b/doc/Changelog
index 96a8a9640..1fb7bd454 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 18 June 2018: Wouter
 	- Fix that control-use-cert: no works for 127.0.0.1 to disable certs.
 	  This fix is part of 1.7.3rc2.
+	- Fix unbound-checkconf for control-use-cert.
 
 15 June 2018: Wouter
 	- tag for 1.7.3rc1.
diff --git a/smallapp/unbound-checkconf.c b/smallapp/unbound-checkconf.c
index a1a3fc62a..37ba9eab3 100644
--- a/smallapp/unbound-checkconf.c
+++ b/smallapp/unbound-checkconf.c
@@ -542,7 +542,8 @@ morechecks(struct config_file* cfg, const char* fname)
 #  endif
 	}
 #endif
-	if(cfg->remote_control_enable && options_remote_is_address(cfg)) {
+	if(cfg->remote_control_enable && options_remote_is_address(cfg)
+		&& cfg->control_use_cert) {
 		check_chroot_string("server-key-file", &cfg->server_key_file,
 			cfg->chrootdir, cfg);
 		check_chroot_string("server-cert-file", &cfg->server_cert_file,