diff --git a/ChangeLog b/ChangeLog
index 6ad0e1aeaa..edd2728500 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-07  Ulrich Drepper  <drepper@gmail.com>
+
+	* nscd/connections.c (register_traced_file): Don't register file
+	for disabled databases.
+
 2011-10-06  Ulrich Drepper  <drepper@gmail.com>
 
 	* nscd/grpcache.c (cache_addgr): Initialize written in all cases.
diff --git a/nscd/connections.c b/nscd/connections.c
index 6e48869c68..7d3ff2e43b 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -891,7 +891,7 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
 void
 register_traced_file (size_t dbidx, struct traced_file *finfo)
 {
-  if (! dbs[dbidx].check_file)
+  if (! dbs[dbidx].enabled || ! dbs[dbidx].check_file)
     return;
 
   if (__builtin_expect (debug_level > 0, 0))