diff --git a/project/RedisServer.scala b/project/RedisServer.scala
index 223f646b..bc350c4f 100644
--- a/project/RedisServer.scala
+++ b/project/RedisServer.scala
@@ -82,7 +82,8 @@ class RedisServer(module: String, port: Int) {
   }
 
   def stop(): Unit =
-    if (!skipServer && wasStartedHere.get()) {
+    if (skipServer || !wasStartedHere.get()) ()
+    else {
       println(s"Stopping Redis container for '$module'")
       stopCmd.!!
       ()
diff --git a/project/SolrServer.scala b/project/SolrServer.scala
index 654c7565..aec613f9 100644
--- a/project/SolrServer.scala
+++ b/project/SolrServer.scala
@@ -100,7 +100,7 @@ class SolrServer(module: String, port: Int) {
   }
 
   def stop(): Unit =
-    if (!skipServer && !wasStartedHere.get()) ()
+    if (skipServer || !wasStartedHere.get()) ()
     else {
       println(s"Stopping Solr container for '$module'")
       stopCmd.!!