diff --git a/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java b/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
index fb2097cb9..81303b47b 100644
--- a/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
+++ b/yoko-core/src/main/java/org/apache/yoko/orb/OB/GIOPServerStarterThreaded.java
@@ -86,6 +86,7 @@ public void run() {
 
         logger.fine("GIOPServer thread started " + this + " using acceptor " + acceptor); 
         try {
+            orbInstance_.getServerPhaser().register();
             //
             // Retrieve the thread group for the servers
             //
@@ -254,6 +255,7 @@ public void starterRun() {
 
                 if (state_ == StateClosed) {
                     logger.fine("Shutting down server thread"); 
+                    orbInstance_.getServerPhaser().arrive();
                     break;
                 }
             }