diff --git a/octoprint/gcodefiles.py b/octoprint/gcodefiles.py
index 3b371213..474ac58f 100644
--- a/octoprint/gcodefiles.py
+++ b/octoprint/gcodefiles.py
@@ -358,8 +358,6 @@ class MetadataAnalyzer:
 	def _work(self):
 		aborted = None
 		while True:
-			self._active.wait()
-
 			if aborted is not None:
 				filename = aborted
 				aborted = None
@@ -368,6 +366,8 @@ class MetadataAnalyzer:
 				(priority, filename) = self._queue.get()
 				self._logger.debug("Processing file %s from queue (priority %d)" % (filename, priority))
 
+			self._active.wait()
+
 			try:
 				self._analyzeGcode(filename)
 				self._queue.task_done()