diff --git a/BTCPayServer/Controllers/ServerController.Storage.cs b/BTCPayServer/Controllers/ServerController.Storage.cs
index 5bd148bef..18b470b30 100644
--- a/BTCPayServer/Controllers/ServerController.Storage.cs
+++ b/BTCPayServer/Controllers/ServerController.Storage.cs
@@ -30,13 +30,14 @@ namespace BTCPayServer.Controllers
         {
             var fileUrl = string.IsNullOrEmpty(fileId) ? null : await _FileService.GetFileUrl(Request.GetAbsoluteRootUri(), fileId);
 
-            return View(new ViewFilesViewModel()
+            var model = new ViewFilesViewModel()
             {
                 Files = await _StoredFileRepository.GetFiles(),
                 SelectedFileId = string.IsNullOrEmpty(fileUrl) ? null : fileId,
                 DirectFileUrl = fileUrl,
                 StorageConfigured = (await _SettingsRepository.GetSettingAsync<StorageSettings>()) != null
-            });
+            };
+            return View(model);
         }
 
         [HttpGet("server/files/{fileId}/delete")]
diff --git a/BTCPayServer/Views/Server/Files.cshtml b/BTCPayServer/Views/Server/Files.cshtml
index dfb7c6616..5f5de22ca 100644
--- a/BTCPayServer/Views/Server/Files.cshtml
+++ b/BTCPayServer/Views/Server/Files.cshtml
@@ -5,48 +5,64 @@
 
 <h2 class="mb-4">@ViewData["PageTitle"]</h2>
 
-<p>
-    Change your <a asp-action="Services" asp-route-returnurl="@ViewData["ReturnUrl"]">external storage service</a> provider.
-    <a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-upload-files-to-btcpay" target="_blank">
-        <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
-    </a>
-</p>
-
-@if (Model.Files.Any())
+@if (!Model.StorageConfigured)
 {
-    <table class="table table-sm table-responsive-md">
-        <thead>
-            <tr>
-                <th>Name</th>
-                <th>Timestamp</th>
-                <th>User</th>
-                <th></th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var file in Model.Files)
-            {
-                <tr>
-                    <td>@file.FileName</td>
-                    <td>@file.Timestamp.ToBrowserDate()</td>
-                    <td>@file.ApplicationUser.UserName</td>
-                    <td>
-                        <a asp-action="Files" asp-route-fileId="@file.Id">Get Link</a>
-                        - <a asp-action="CreateTemporaryFileUrl" asp-route-fileId="@file.Id">Get Temp Link</a>
-                        - <a asp-action="DeleteFile" asp-route-fileId="@file.Id">Remove</a>
-                    </td>
-                </tr>
-            }
-        </tbody>
-    </table>
+    <p>
+        Before being able to upload you first need to 
+        <a asp-action="storage" asp-route-forceChoice="true" asp-route-returnurl="@ViewData["ReturnUrl"]">
+            choose your external storage service provider
+        </a>.
+        <a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-upload-files-to-btcpay" target="_blank">
+            <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+        </a>
+    </p>
 }
 else
 {
-    <p class="text-secondary mt-3">
-        There are no files yet.
+    <p>
+        Change your <a asp-action="storage" asp-route-forceChoice="true" asp-route-returnurl="@ViewData["ReturnUrl"]">external storage service</a> provider.
+        <a href="https://docs.btcpayserver.org/FAQ/FAQ-ServerSettings/#how-to-upload-files-to-btcpay" target="_blank">
+            <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
+        </a>
     </p>
+
+    @if (Model.Files.Any())
+    {
+        <table class="table table-sm table-responsive-md">
+            <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Timestamp</th>
+                    <th>User</th>
+                    <th></th>
+                </tr>
+            </thead>
+            <tbody>
+                @foreach (var file in Model.Files)
+                {
+                    <tr>
+                        <td>@file.FileName</td>
+                        <td>@file.Timestamp.ToBrowserDate()</td>
+                        <td>@file.ApplicationUser.UserName</td>
+                        <td>
+                            <a asp-action="Files" asp-route-fileId="@file.Id">Get Link</a>
+                            - <a asp-action="CreateTemporaryFileUrl" asp-route-fileId="@file.Id">Get Temp Link</a>
+                            - <a asp-action="DeleteFile" asp-route-fileId="@file.Id">Remove</a>
+                        </td>
+                    </tr>
+                }
+            </tbody>
+        </table>
+    }
+    else
+    {
+        <p class="text-secondary mt-3">
+            There are no files yet.
+        </p>
+    }
 }
 
+
 @if (!string.IsNullOrEmpty(Model.SelectedFileId))
 {
     var file = Model.Files.Single(storedFile => storedFile.Id.Equals(Model.SelectedFileId, StringComparison.InvariantCultureIgnoreCase));