diff --git a/ChangeLog b/ChangeLog
index e8b9b7487a..1b49fb3f0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Changes in version 0.1.2.8-alpha - 2007-??-??
       guess that an unrecognized directory will have the average bandwidth
       from all known directories, not that it will have the average
       bandwidth from those directories earlier than it on the list.
+    - If we start a server with ClientOnly 1, then set ClientOnly to 0
+      and hup, stop triggering an assert based on an empty onion_key.
 
   o Minor features:
     - Warn the user when an application uses the obsolete binary v0
diff --git a/src/or/config.c b/src/or/config.c
index 0d4832540e..81874bc54f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2829,6 +2829,7 @@ options_transition_affects_workers(or_options_t *old_options,
       old_options->ServerDNSSearchDomains !=
                                        new_options->ServerDNSSearchDomains ||
       old_options->SafeLogging != new_options->SafeLogging ||
+      old_options->ClientOnly != new_options->ClientOnly ||
       !config_lines_eq(old_options->Logs, new_options->Logs))
     return 1;