diff --git a/source/java/org/alfresco/repo/domain/hibernate/Store.hbm.xml b/source/java/org/alfresco/repo/domain/hibernate/Store.hbm.xml
index 9674f1c5ae..4890153a0a 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/Store.hbm.xml
+++ b/source/java/org/alfresco/repo/domain/hibernate/Store.hbm.xml
@@ -24,7 +24,7 @@
       <!-- forward assoc to root node -->
       <many-to-one
             name="rootNode"
-            not-null="true"
+            not-null="false"
             foreign-key="fk_alf_store_rn"
             lazy="proxy"
             class="org.alfresco.repo.domain.hibernate.NodeImpl"
diff --git a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
index c96257291a..9fed05f090 100644
--- a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
@@ -452,6 +452,9 @@ public class HibernateNodeDaoServiceImpl extends HibernateDaoSupport implements
         list = (List<NodeImpl>)query.list();
         getHibernateTemplate().deleteAll(list);
         
+        store.setRootNode(null);
+        getHibernateTemplate().update(store);
+        
         // delete root node and store
         getHibernateTemplate().delete(rootNode);
         getHibernateTemplate().delete(store);