diff --git a/reviewboard/admin/forms.py b/reviewboard/admin/forms.py
index dfcc40e9f61d326ddd81231992497f5beb6943f4..f25bce1fb286ba75bae69c239771a510a4b9db3a 100644
--- a/reviewboard/admin/forms.py
+++ b/reviewboard/admin/forms.py
@@ -940,6 +940,9 @@ class StorageSettingsForm(SiteSettingsForm):
             if storage_backend != 's3':
                 set_fieldset_required('storage_s3', False)
 
+            if storage_backend != 'swift':
+                set_fieldset_required('storage_swift', False)
+
             if storage_backend != 'couchdb':
                 set_fieldset_required('storage_couchdb', False)