diff --git a/core/includes/update.inc b/core/includes/update.inc
index 91fa158..791fb54 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -500,7 +500,9 @@ function update_fix_d8_requirements() {
   // but the upgrade path needs to include all File module updates. Since module
   // updates are collected only once before they are executed, it has to be
   // enabled before available updates are collected.
-  if (update_get_schema_version('file') == SCHEMA_UNINSTALLED) {
+  // This change happened when System module's schema version was 8018. File
+  // module must not be enabled for existing D8 sites that do not need it.
+  if (update_get_schema_version('file') == SCHEMA_UNINSTALLED && update_get_schema_version('system') <= 8018) {
     update_module_enable(array('file'));
   }
 }