diff --git a/core/Application.php b/core/Application.php
index 400d86f59910093642eb4c3e77b16a4a443abb12..336538187d76680af3e2d6c6c649fc09ccc77b16 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -71,6 +71,14 @@ class Application extends App {
 						$subject->addHintForMissingSubject($table->getName(), 'parent_index');
 					}
 				}
+
+				if ($schema->hasTable('filecache')) {
+					$table = $schema->getTable('filecache');
+
+					if (!$table->hasIndex('fs_mtime')) {
+						$subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
+					}
+				}
 			}
 		);
 	}
diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php
index b30fa43ab3917629840598f73f3ba3b51fec9e20..5d78d360b495b6289ae6fdf17d025928a1005336 100644
--- a/core/Command/Db/AddMissingIndices.php
+++ b/core/Command/Db/AddMissingIndices.php
@@ -100,6 +100,17 @@ class AddMissingIndices extends Command {
 			}
 		}
 
+		if ($schema->hasTable('filecache')) {
+			$table = $schema->getTable('filecache');
+			if (!$table->hasIndex('fs_mtime')) {
+				$output->writeln('<info>Adding additional mtime index to the filecache table, this can take some time...</info>');
+				$table->addIndex(['mtime'], 'fs_mtime');
+				$this->connection->migrateToSchema($schema->getWrappedSchema());
+				$updated = true;
+				$output->writeln('<info>Filecache table updated successfully.</info>');
+			}
+		}
+
 		if (!$updated) {
 			$output->writeln('<info>Done.</info>');
 		}
diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php
index 05623e435c3befffc163ea8ac42727f6f960c1a5..29687b8683fda9b24be2b519eef3c09e2c8f0975 100644
--- a/core/Migrations/Version13000Date20170718121200.php
+++ b/core/Migrations/Version13000Date20170718121200.php
@@ -215,6 +215,7 @@ class Version13000Date20170718121200 extends SimpleMigrationStep {
 			$table->addIndex(['storage', 'mimetype'], 'fs_storage_mimetype');
 			$table->addIndex(['storage', 'mimepart'], 'fs_storage_mimepart');
 			$table->addIndex(['storage', 'size', 'fileid'], 'fs_storage_size');
+			$table->addIndex(['mtime'], 'fs_mtime');
 		}
 
 		if (!$schema->hasTable('group_user')) {