diff --git a/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AdbMonkeyRunner.java b/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AdbMonkeyRunner.java
index 698ae7320..48af33527 100644
--- a/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AdbMonkeyRunner.java
+++ b/agent/src/main/java/com/microsoft/hydralab/agent/runner/monkey/AdbMonkeyRunner.java
@@ -69,6 +69,8 @@ protected void run(TestRunDevice testRunDevice, TestTask testTask, TestRun testR
         performanceTestManagementService.testStarted(TEST_RUN_NAME);
         long checkTime = runMonkeyTestOnce(testRun, logger, testTask.getInstrumentationArgs(),
                 testTask.getMaxStepCount());
+
+        releaseResource(testTask, testRunDevice, testRun);
         if (checkTime > 0) {
             String crashStack = testRun.getCrashStack();
             if (crashStack != null && !"".equals(crashStack)) {
@@ -83,7 +85,7 @@ protected void run(TestRunDevice testRunDevice, TestTask testTask, TestRun testR
             }
         }
         performanceTestManagementService.testRunFinished();
-        testRunEnded(testTask, testRunDevice, testRun);
+        testRunEnded(testRun);
 
         /** set paths */
         String absoluteReportPath = testRun.getResultFolder().getAbsolutePath();
@@ -180,9 +182,7 @@ public long runMonkeyTestOnce(TestRun testRun, Logger logger,
         return checkTime;
     }
 
-    public void testRunEnded(TestTask testTask, TestRunDevice testRunDevice, TestRun testRun) {
-        testRun.addNewTimeTag("testRunEnded", System.currentTimeMillis() - recordingStartTimeMillis);
-        testRun.onTestEnded();
+    public void releaseResource(TestTask testTask, TestRunDevice testRunDevice, TestRun testRun) {
         testRunDeviceOrchestrator.setRunningTestName(testRunDevice, null);
         testRunDeviceOrchestrator.stopGitEncoder(testRunDevice, agentManagementService.getScreenshotDir(), logger);
         if (!testTask.isDisableRecording()) {
@@ -190,4 +190,9 @@ public void testRunEnded(TestTask testTask, TestRunDevice testRunDevice, TestRun
         }
         testRunDeviceOrchestrator.stopLogCollector(testRunDevice);
     }
+
+    public void testRunEnded(TestRun testRun) {
+        testRun.addNewTimeTag("testRunEnded", System.currentTimeMillis() - recordingStartTimeMillis);
+        testRun.onTestEnded();
+    }
 }