diff --git a/ChangeLog b/ChangeLog
index 32246d195..63c145f67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreTable.m (-setHandleId:): only register the
+	table in the notification cache if the provided handle id is not
+	null.
+
 	* OpenChange/MAPIStoreCalendarMessage.m (-save): resynchronise the
 	container cache after the operation.
 
diff --git a/OpenChange/MAPIStoreTable.m b/OpenChange/MAPIStoreTable.m
index 390a8697f..530949709 100644
--- a/OpenChange/MAPIStoreTable.m
+++ b/OpenChange/MAPIStoreTable.m
@@ -302,7 +302,6 @@ static Class NSDataK, NSStringK;
   if ((self = [self init]))
     {
       container = newContainer;
-      [[MAPIStoreActiveTables activeTables] registerTable: self];
     }
 
   return self;
@@ -346,6 +345,8 @@ static Class NSDataK, NSStringK;
 - (void) setHandleId: (uint32_t) newHandleId
 {
   handleId = newHandleId;
+  if (newHandleId)
+    [[MAPIStoreActiveTables activeTables] registerTable: self];
 }
 
 - (void) destroyHandle: (uint32_t) tableHandleId