diff --git a/glassfish-managed/src/main/java/ee/omnifish/arquillian/container/glassfish/managed/GlassFishManagedDeployableContainer.java b/glassfish-managed/src/main/java/ee/omnifish/arquillian/container/glassfish/managed/GlassFishManagedDeployableContainer.java
index 01bbb91..63472c3 100644
--- a/glassfish-managed/src/main/java/ee/omnifish/arquillian/container/glassfish/managed/GlassFishManagedDeployableContainer.java
+++ b/glassfish-managed/src/main/java/ee/omnifish/arquillian/container/glassfish/managed/GlassFishManagedDeployableContainer.java
@@ -146,7 +146,7 @@ public void undeploy(Archive<?> archive) throws DeploymentException {
 
     @Override
     public void stop() throws LifecycleException {
-        if (!connectedToRunningServer && !configuration.isKeepServerRunning()) {
+        if (!connectedToRunningServer && glassFishManager.isDASRunning() && !configuration.isKeepServerRunning()) {
             glassFishServerControl.stop();
         }
     }