diff --git a/src/host/HostPool.cc b/src/host/HostPool.cc
index 762550e6d6..70aca1c245 100644
--- a/src/host/HostPool.cc
+++ b/src/host/HostPool.cc
@@ -281,8 +281,7 @@ int HostPool::discover(map<int, string> * discovered_hosts, int host_limit)
                  static_cast<void *>(discovered_hosts));
 
     sql << "SELECT oid, body FROM "
-        << Host::table << " WHERE state != "
-        << Host::DISABLED << " ORDER BY last_mon_time ASC LIMIT " << host_limit;
+        << Host::table << " ORDER BY last_mon_time ASC LIMIT " << host_limit;
 
     rc = db->exec(sql,this);
 
diff --git a/src/im/InformationManager.cc b/src/im/InformationManager.cc
index b3fb10f42b..61b98002c6 100644
--- a/src/im/InformationManager.cc
+++ b/src/im/InformationManager.cc
@@ -200,8 +200,7 @@ void InformationManager::timer_action()
             hpool->update(host);
         }
 
-        if ( host->isEnabled() && !(host->isMonitoring()) && 
-            (monitor_length >= monitor_period))
+        if ( !(host->isMonitoring()) && (monitor_length >= monitor_period))
         {
             oss.str("");
             oss << "Monitoring host " << host->get_name()