diff --git a/package.json b/package.json
index 21ff830..1ccd912 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "mocha": "^5.0.0",
     "nyc": "^12.0.1",
     "request": "^2.83.0",
-    "rimraf": "^2.6.2",
+    "rimraf": "^3.0.1",
     "ts-node": "^7.0.0",
     "typescript": "^2.6.1"
   },
diff --git a/src/routes/api/run.ts b/src/routes/api/run.ts
index 6097a2d..7c5903b 100644
--- a/src/routes/api/run.ts
+++ b/src/routes/api/run.ts
@@ -50,6 +50,8 @@ const handleTimeoutForSubmission = function (submissionId: number) {
     case 'callback':
       axios.post(job.callback, errorResponse)
   }
+
+  delete runPool[submissionId]
 }
 
 const handleSuccessForSubmission = function (result: RunResponse) {
@@ -79,6 +81,8 @@ const handleSuccessForSubmission = function (result: RunResponse) {
       })()
       break;
   }
+
+  delete runPool[result.id]
 }
 
 /**
@@ -172,7 +176,6 @@ route.post('/', (req, res, next) => {
     setTimeout(() => {
       if (runPool[submission.id]) {
         handleTimeoutForSubmission(submission.id)
-        delete runPool[submission.id]
       }
     }, config.RUN.TIMEOUT)
 
@@ -198,7 +201,6 @@ route.post('/', (req, res, next) => {
 successListener.on('success', (result: RunResponse) => {
   if (runPool[result.id]) {
     handleSuccessForSubmission(result)
-    delete runPool[result.id]
   }
   Submissions.update(<any>{
     end_time: new Date()
diff --git a/yarn.lock b/yarn.lock
index db0dc65..162dcbb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1184,6 +1184,18 @@ glob@7.1.2, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.3:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globals@^11.1.0:
   version "11.9.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
@@ -2446,6 +2458,13 @@ rimraf@^2.6.1, rimraf@^2.6.2:
   dependencies:
     glob "^7.0.5"
 
+rimraf@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.1.tgz#48d3d4cb46c80d388ab26cd61b1b466ae9ae225a"
+  integrity sha512-IQ4ikL8SjBiEDZfk+DFVwqRK8md24RWMEJkdSlgNLkyyAImcjf8SWvU1qFMDOb4igBClbTQ/ugPqXcRwdFTxZw==
+  dependencies:
+    glob "^7.1.3"
+
 safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"