diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp
index 431d796a9a2..8ff265f4414 100644
--- a/mozilla/xpcom/components/nsComponentManager.cpp
+++ b/mozilla/xpcom/components/nsComponentManager.cpp
@@ -3113,7 +3113,8 @@ nsComponentManagerImpl::AutoRegisterImpl(PRInt32 when,
                                   nsnull,
                                   "end");    
 
-    FlushPersistentStore(PR_TRUE);
+    if (mRegistryDirty)
+        FlushPersistentStore(PR_TRUE);
     return rv;
 }