diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java
index e0afa5ea741..e1e99c7666c 100644
--- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java
+++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java
@@ -585,11 +585,10 @@ private void initORB(Properties props) {
             orb = ORBFactory.create() ;
             prevCL = Utility.getClassLoader();
             try {
-               if (processType != processType.Other) {
+              if (processType != processType.Other && !prevCL.getClass().getName().contains("OSGi")) {
                 Utility.setContextClassLoader(prevCL.getParent());
                }
-            
-                ORBFactory.initialize( orb, args, orbInitProperties, useOSGI);
+               ORBFactory.initialize( orb, args, orbInitProperties, useOSGI);
             } finally {
                 Utility.setContextClassLoader(prevCL);
             }