diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/ControlClient.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/ControlClient.java
index 4139278..1ad93d5 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/ControlClient.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/ControlClient.java
@@ -51,7 +51,7 @@ public class ControlClient {
 		target.request().delete();
 	}
 	
-	public boolean isActive(){
-		return target.request().get(Boolean.class);
+	public boolean isActive(String trackingId){
+		return target.path(trackingId).path("running").request().get(Boolean.class);
 	}
 }
diff --git a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/RemoteAcquisitionMain.java b/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/RemoteAcquisitionMain.java
index bfd5e38..71837ab 100644
--- a/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/RemoteAcquisitionMain.java
+++ b/ch.psi.fda/src/main/java/ch/psi/fda/rest/client/RemoteAcquisitionMain.java
@@ -249,7 +249,7 @@ public class RemoteAcquisitionMain {
 					client.terminate(trackingId);
 
 					int count = 0;
-					while (client.isActive()) {
+					while (client.isActive(trackingId)) {
 						if (count == 10) {
 							break;
 						}