diff --git a/py/pysparkling/context.py b/py/pysparkling/context.py
index <HASH>..<HASH> 100644
--- a/py/pysparkling/context.py
+++ b/py/pysparkling/context.py
@@ -183,7 +183,8 @@ class H2OContext(object):
 
     def __stop(self):
         try:
-            h2o.cluster().shutdown()
+            if not (self._conf.is_manual_cluster_start_used() and self._conf.runs_in_external_cluster_mode()):
+                h2o.cluster().shutdown()
         except:
             pass
[SW-<I>] Pysparkling in external backend, manual mode stops the backend cluster, but the cluster should be left intact (#<I>)