diff --git a/core/modules/file/src/FileUsage/FileUsageBase.php b/core/modules/file/src/FileUsage/FileUsageBase.php
index c768615..2e02c90 100644
--- a/core/modules/file/src/FileUsage/FileUsageBase.php
+++ b/core/modules/file/src/FileUsage/FileUsageBase.php
@@ -32,7 +32,7 @@ public function __construct(ConfigFactoryInterface $config_factory = NULL) {
    */
   public function add(FileInterface $file, $module, $type, $id, $count = 1) {
     // Make sure that a used file is permanent.
-    if ($this->configFactory->get('file.settings')->get('file_usage_temporary') && !$file->isPermanent()) {
+    if (!$file->isPermanent()) {
       $file->setPermanent();
       $file->save();
     }
@@ -42,15 +42,17 @@ public function add(FileInterface $file, $module, $type, $id, $count = 1) {
    * {@inheritdoc}
    */
   public function delete(FileInterface $file, $module, $type = NULL, $id = NULL, $count = 1) {
-
-
+    // Do not actually mark files as temporary when the behavior is disabled.
+    if (!$this->configFactory->get('file.settings')->get('file_usage_temporary')) {
+      return;
+    }
 
     // If there are no more remaining usages of this file, mark it as temporary,
     // which result in a delete through system_cron().
     $usage = \Drupal::service('file.usage')->listUsage($file);
     if (empty($usage)) {
-      //$file->setTemporary();
-      //$file->save();
+      $file->setTemporary();
+      $file->save();
     }
   }