diff --git a/core/modules/file/src/Entity/File.php b/core/modules/file/src/Entity/File.php
index f61c491478520706233a077384e10bfc4ccb65a1..cf8848bff88eb9678c880d994907b08c8a87f129 100644
--- a/core/modules/file/src/Entity/File.php
+++ b/core/modules/file/src/Entity/File.php
@@ -256,7 +256,8 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
 
     $fields['uri'] = FieldDefinition::create('uri')
       ->setLabel(t('URI'))
-      ->setDescription(t('The URI to access the file (either local or remote).'));
+      ->setDescription(t('The URI to access the file (either local or remote).'))
+      ->setSetting('max_length', 255);
 
     $fields['filemime'] = FieldDefinition::create('string')
       ->setLabel(t('File MIME type'))
diff --git a/core/modules/file/src/FileStorage.php b/core/modules/file/src/FileStorage.php
index 1ec8fbf59962e8397bcd522e5f5491fcf6a20ce5..93dae425a690ea6780f04032fae4db0470f5082a 100644
--- a/core/modules/file/src/FileStorage.php
+++ b/core/modules/file/src/FileStorage.php
@@ -46,10 +46,7 @@ public function getSchema() {
       'file__changed' => array('changed'),
     );
     $schema['file_managed']['unique keys'] += array(
-      // FIXME We have an index size of 255, but the max URI length is 2048 so
-      // this might now always work. Should we replace this with a regular
-      // index?
-      'file__uri' => array(array('uri', 255)),
+      'file__uri' => array('uri'),
     );
 
     return $schema;