diff --git a/Netdisco/Changes b/Netdisco/Changes
index 551b0bee..e170c126 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -21,6 +21,7 @@
   * FATAL warnings considered harmful
   * Only show STP blocked icon if port is UP
   * Store device model and serial via UTF8 conversion
+  * Only set housekeeping default if user has enabled
 
 2.024004 - 2014-03-04
 
diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index c847571a..49c2ed0f 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -52,7 +52,7 @@ setting('dns')->{hosts_file} ||= '/etc/hosts';
 
 # housekeeping expire used to be called expiry
 setting('housekeeping')->{expire} ||= setting('housekeeping')->{expiry}
-  if exists setting('housekeeping')->{expiry};
+  if setting('housekeeping') and exists setting('housekeeping')->{expiry};
 
 =head1 NAME