diff --git a/jboss-as/cluster/src/main/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java b/jboss-as/cluster/src/main/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java
index 6c09f54..ff844a1 100644
--- a/jboss-as/cluster/src/main/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java
+++ b/jboss-as/cluster/src/main/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java
@@ -50,6 +50,7 @@ public abstract class AbstractHAServiceMBeanSupport<S extends HAService<Notifica
    implements HAServiceMBean, HAService<Notification>, EventFactory<Notification>, EventFacility<Notification>
 {
    private final S service = this.createHAService();
+   private ClusterPartitionMBean clusterPartition;
 
    private volatile boolean sendLocalLifecycleNotifications = true;
    private volatile boolean sendRemoteLifecycleNotifications = true;
@@ -84,7 +85,7 @@ public abstract class AbstractHAServiceMBeanSupport<S extends HAService<Notifica
    {
       if ((this.getState() != STARTED) && (this.getState() != STARTING))
       {
-         this.service.setHAPartition(clusterPartition.getHAPartition());
+         this.clusterPartition = clusterPartition;
       }
    }
 
@@ -224,7 +225,9 @@ public abstract class AbstractHAServiceMBeanSupport<S extends HAService<Notifica
 
    protected void setupPartition() throws Exception
    {
-      // method no longer used by base implementation
+      if ( clusterPartition != null )
+         this.service.setHAPartition(clusterPartition.getHAPartition());
    }
 
    @SuppressWarnings("unchecked")