diff --git a/app/assets/javascripts/admin/templates/dashboard_next.hbs b/app/assets/javascripts/admin/templates/dashboard_next.hbs
index f5470dfd7a8..20b781c2e7c 100644
--- a/app/assets/javascripts/admin/templates/dashboard_next.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard_next.hbs
@@ -90,27 +90,29 @@
     </div>
     {{#conditional-loading-section isLoading=isLoading title=(i18n "admin.dashboard.backups")}}
       <div class="misc">
-        <div class="durability">
-          {{#if currentUser.admin}}
-            <div class="backups">
-              <h3 class="durability-title">
-                <a href="/admin/backups">{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
-              </h3>
+        {{#if diskSpace}}
+          <div class="durability">
+            {{#if currentUser.admin}}
+              <div class="backups">
+                <h3 class="durability-title">
+                  <a href="/admin/backups">{{d-icon "archive"}} {{i18n "admin.dashboard.backups"}}</a>
+                </h3>
+                <p>
+                  {{diskSpace.backups_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.backups_free}})
+                  <br />
+                  {{{i18n "admin.dashboard.lastest_backup" date=backupTimestamp}}}
+                </p>
+              </div>
+            {{/if}}
+
+            <div class="uploads">
+              <h3 class="durability-title">{{d-icon "upload"}} {{i18n "admin.dashboard.uploads"}}</h3>
               <p>
-                {{diskSpace.backups_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.backups_free}})
-                <br />
-                {{{i18n "admin.dashboard.lastest_backup" date=backupTimestamp}}}
+                {{diskSpace.uploads_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.uploads_free}})
               </p>
             </div>
-          {{/if}}
-
-          <div class="uploads">
-            <h3 class="durability-title">{{d-icon "upload"}} {{i18n "admin.dashboard.uploads"}}</h3>
-            <p>
-              {{diskSpace.uploads_used}} ({{i18n "admin.dashboard.space_free" size=diskSpace.uploads_free}})
-            </p>
           </div>
-        </div>
+        {{/if}}
 
         <div class="last-dashboard-update">
           <div>
diff --git a/app/controllers/admin/dashboard_next_controller.rb b/app/controllers/admin/dashboard_next_controller.rb
index 47eef7b5f4c..a564fd64ee2 100644
--- a/app/controllers/admin/dashboard_next_controller.rb
+++ b/app/controllers/admin/dashboard_next_controller.rb
@@ -4,7 +4,7 @@ class Admin::DashboardNextController < Admin::AdminController
   def index
     dashboard_data = AdminDashboardNextData.fetch_cached_stats
     dashboard_data.merge!(version_check: DiscourseUpdates.check_version.as_json) if SiteSetting.version_checks?
-    dashboard_data[:disk_space] = DiskSpace.cached_stats
+    dashboard_data[:disk_space] = DiskSpace.cached_stats if SiteSetting.enable_backups
     render json: dashboard_data
   end
 end