diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index d8c61d0f456..67c589ed755 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -26,6 +26,7 @@
 		<job>OCA\Files\BackgroundJob\ScanFiles</job>
 		<job>OCA\Files\BackgroundJob\DeleteOrphanedItems</job>
 		<job>OCA\Files\BackgroundJob\CleanupFileLocks</job>
+		<job>OCA\Files\BackgroundJob\CleanupDirectEditingTokens</job>
 	</background-jobs>
 
 	<commands>
diff --git a/apps/files/lib/BackgroundJob/CleanupDirectEditingTokens.php b/apps/files/lib/BackgroundJob/CleanupDirectEditingTokens.php
new file mode 100644
index 00000000000..77907fab281
--- /dev/null
+++ b/apps/files/lib/BackgroundJob/CleanupDirectEditingTokens.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace OCA\Files\BackgroundJob;
+
+use OC\BackgroundJob\TimedJob;
+use OCP\DirectEditing\IManager;
+
+class CleanupDirectEditingTokens extends TimedJob {
+
+	const INTERVAL_MINUTES = 15 * 60;
+
+	/**
+	 * @var IManager
+	 */
+	private $manager;
+
+	public function __construct(IManager $manager) {
+		$this->interval = self::INTERVAL_MINUTES;
+		$this->manager = $manager;
+	}
+
+	/**
+	 * Makes the background job do its work
+	 *
+	 * @param array $argument unused argument
+	 * @throws \Exception
+	 */
+	public function run($argument) {
+		$this->manager->cleanup();
+	}
+}