diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
index ead6a6f..567bd33 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
@@ -181,20 +181,6 @@
       throw new UnsupportedOperationException("Callable not implemented");
     }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void afterExecute(Runnable r, Throwable t) {
-      if (r instanceof Task) {
-        final Task<?> task = (Task<?>) r;
-        if (!task.isPeriodic()) {
-          remove(task);
-        }
-      } else {
-        log.error("Non task object in queue: " + r.getClass() + ": " + r);
-      }
-      super.afterExecute(r, t);
-    }
-
     void remove(final Task<?> task) {
       all.remove(task.getTaskId(), task);
     }
@@ -330,6 +316,8 @@
         } finally {
           if (isPeriodic()) {
             running.set(false);
+          } else {
+            executor.remove(this);
           }
         }
       }