diff --git a/web/concrete/controllers/single_page/dashboard/system/files/storage.php b/web/concrete/controllers/single_page/dashboard/system/files/storage.php
index 67cdfccf2eb..0efd6d7d063 100644
--- a/web/concrete/controllers/single_page/dashboard/system/files/storage.php
+++ b/web/concrete/controllers/single_page/dashboard/system/files/storage.php
@@ -95,6 +95,7 @@ public function update()
             if (!$fsl->isDefault()) {
                 $fsl->setIsDefault($request->request->get('fslIsDefault'));
             }
+            $fsl->setConfigurationObject($configuration);
             $fsl->save();
             $this->redirect('/dashboard/system/files/storage', 'storage_location_updated');
         }
diff --git a/web/concrete/src/File/File.php b/web/concrete/src/File/File.php
index a38f3c07b51..0f07da41b0d 100644
--- a/web/concrete/src/File/File.php
+++ b/web/concrete/src/File/File.php
@@ -208,7 +208,7 @@ public function setFileStorageLocation(StorageLocation $newLocation)
             $currentFilesystem->delete($fh->prefix($fv->getPrefix(), $fv->getFilename()));
         }
 
-        $this->location = $newLocation;
+        $this->storageLocation = $newLocation;
         $this->save();
     }