diff --git a/includes/registry.inc b/includes/registry.inc
index 3fb14fb..6cc58d4 100644
--- a/includes/registry.inc
+++ b/includes/registry.inc
@@ -33,8 +33,8 @@ function _registry_update() {
   require_once DRUPAL_ROOT . '/includes/database/select.inc';
   require_once DRUPAL_ROOT . '/includes/database/' . $driver . '/query.inc';
 
-  // Get current list of modules and their files.
-  $modules = db_query("SELECT * FROM {system} WHERE type = 'module'")->fetchAll();
+  // Fetch list of currently activated modules and their files.
+  $modules = db_query("SELECT * FROM {system} WHERE type = 'module' AND 'status' = 1")->fetchAll();
   // Get the list of files we are going to parse.
   $files = array();
   foreach ($modules as &$module) {
@@ -44,12 +44,10 @@ function _registry_update() {
     // Store the module directory for use in hook_registry_files_alter().
     $module->dir = $dir;
 
-    if ($module->status) {
       // Add files for enabled modules to the registry.
       foreach ($module->info['files'] as $file) {
         $files["$dir/$file"] = array('module' => $module->name, 'weight' => $module->weight);
       }
-    }
   }
   foreach (file_scan_directory('includes', '/\.inc$/') as $filename => $file) {
     $files["$filename"] = array('module' => '', 'weight' => 0);