diff --git a/core/Application.php b/core/Application.php
index 460a645f10c14..8dd618c1d131d 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -186,6 +186,9 @@ function (GenericEvent $event) use ($container) {
 					if (!$table->hasIndex('properties_path_index')) {
 						$subject->addHintForMissingSubject($table->getName(), 'properties_path_index');
 					}
+					if (!$table->hasIndex('properties_pathonly_index')) {
+						$subject->addHintForMissingSubject($table->getName(), 'properties_pathonly_index');
+					}
 				}
 
 				if ($schema->hasTable('jobs')) {
diff --git a/core/Command/Db/AddMissingIndices.php b/core/Command/Db/AddMissingIndices.php
index 79269a01f53a4..dceaed3c2c322 100644
--- a/core/Command/Db/AddMissingIndices.php
+++ b/core/Command/Db/AddMissingIndices.php
@@ -301,11 +301,24 @@ private function addCoreIndexes(OutputInterface $output) {
 		$output->writeln('<info>Check indices of the oc_properties table.</info>');
 		if ($schema->hasTable('properties')) {
 			$table = $schema->getTable('properties');
+			$propertiesUpdated = false;
+
 			if (!$table->hasIndex('properties_path_index')) {
 				$output->writeln('<info>Adding properties_path_index index to the oc_properties table, this can take some time...</info>');
 
 				$table->addIndex(['userid', 'propertypath'], 'properties_path_index');
 				$this->connection->migrateToSchema($schema->getWrappedSchema());
+				$propertiesUpdated = true;
+			}
+			if (!$table->hasIndex('properties_pathonly_index')) {
+				$output->writeln('<info>Adding properties_pathonly_index index to the oc_properties table, this can take some time...</info>');
+
+				$table->addIndex(['propertypath'], 'properties_pathonly_index');
+				$this->connection->migrateToSchema($schema->getWrappedSchema());
+				$propertiesUpdated = true;
+			}
+
+			if ($propertiesUpdated) {
 				$updated = true;
 				$output->writeln('<info>oc_properties table updated successfully.</info>');
 			}
diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php
index a6ff1cbfa9431..629a0a1e9f23a 100644
--- a/core/Migrations/Version13000Date20170718121200.php
+++ b/core/Migrations/Version13000Date20170718121200.php
@@ -358,6 +358,7 @@ public function changeSchema(IOutput $output, \Closure $schemaClosure, array $op
 			$table->setPrimaryKey(['id']);
 			$table->addIndex(['userid'], 'property_index');
 			$table->addIndex(['userid', 'propertypath'], 'properties_path_index');
+			$table->addIndex(['propertypath'], 'properties_pathonly_index');
 		} else {
 			$table = $schema->getTable('properties');
 			if ($table->hasColumn('propertytype')) {