diff --git a/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java b/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
index 62458828ed..d2ad5ee7e7 100644
--- a/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
+++ b/source/java/org/alfresco/repo/descriptor/DescriptorServiceImpl.java
@@ -144,9 +144,6 @@ public class DescriptorServiceImpl implements DescriptorService, ApplicationList
     {
         if (event instanceof ContextRefreshedEvent)
         {
-            // initialise server descriptor
-            serverDescriptor = createServerDescriptor();
-            
             // initialise the repository descriptor
             // note: this requires that the repository schema has already been initialised
             TransactionWork<Descriptor> createDescriptorWork = new TransactionUtil.TransactionWork<Descriptor>()
@@ -169,6 +166,8 @@ public class DescriptorServiceImpl implements DescriptorService, ApplicationList
      */
     public void afterPropertiesSet() throws Exception
     {
+        // initialise server descriptor
+        serverDescriptor = createServerDescriptor();
     }
 
     /**