diff --git a/tracking/btree.py b/tracking/btree.py
index ffea4c4..b52f96c 100644
--- a/tracking/btree.py
+++ b/tracking/btree.py
@@ -60,8 +60,10 @@ class TrackingStorage(BTreeContainer):
         return self.runId
 
     def stopRun(self, taskId):
-        if taskId in self.currentRuns:
+        runId = self.currentRuns.get(taskId)
+        if runId:
             del self.currentRuns[taskId]
+        return runId
 
     def saveUserTrack(self, taskId, runId, userName, data, replace=False):
         if not runId: