diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 5ce496eca..dcd97aee4 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -774,6 +774,7 @@ label.configuration-action=Action
 message.delete-property-title=Delete Configuration?
 message.delete-property-body=You are requesting to delete a configuration set. If you complete this process the set will be removed. This cannot be undone. Do you wish to continue?
 message.name-required=Name is required.
+message.properties-none=At least one property is required.
 
 label.external-description=Description
 
diff --git a/ui/src/app/admin/component/ConfigurationForm.js b/ui/src/app/admin/component/ConfigurationForm.js
index 49f8abb7f..90bd31db9 100644
--- a/ui/src/app/admin/component/ConfigurationForm.js
+++ b/ui/src/app/admin/component/ConfigurationForm.js
@@ -29,6 +29,9 @@ export function ConfigurationForm({ configurations, configuration = {}, loading,
     const { fields, append, remove } = useFieldArray({
         control,
         name: "properties",
+        rules: {
+            minLength: 1
+        }
     });
 
     const properties = useProperties();
@@ -80,7 +83,7 @@ export function ConfigurationForm({ configurations, configuration = {}, loading,
                     <Button variant="info" className="me-2"
                         type="button"
                         onClick={() => saveConfig(getValues())}
-                        disabled={ !isValid || loading}
+                        disabled={ !isValid || fields.length < 1 || loading}
                         aria-label="Save changes to the metadata source. You will return to the dashboard">
                         <FontAwesomeIcon icon={loading ? faSpinner : faSave} pulse={loading} />&nbsp;
                         <Translate value="action.save">Save</Translate>
@@ -169,6 +172,13 @@ export function ConfigurationForm({ configurations, configuration = {}, loading,
                                         </td>
                                     </tr>
                                 ))}
+                                {fields.length === 0 &&
+                                <tr>
+                                    <td colSpan="5">
+                                        <Translate value="message.properties-none">At least one property is required.</Translate>
+                                    </td>
+                                </tr>
+                                }
                             </tbody>
                         </table>
                     </div>
diff --git a/ui/src/app/admin/component/PropertySelector.js b/ui/src/app/admin/component/PropertySelector.js
index f0016e42e..85da52888 100644
--- a/ui/src/app/admin/component/PropertySelector.js
+++ b/ui/src/app/admin/component/PropertySelector.js
@@ -9,8 +9,7 @@ export function PropertySelector ({ properties, options, onAddProperties }) {
 
     const menu = useCallback((results, menuProps, state) => {
         let index = 0;
-        const mapped = results.map((p, idx) => !p.category || p.category === '?' ? { ...p, category: 'Misc' } : p);
-        const ordered = orderBy(mapped, 'category');
+        const ordered = orderBy(results, 'category');
         const grouped = groupBy(ordered, 'category');
         const items = Object.keys(grouped).sort().map((item) => {
             index = index + 1;
diff --git a/ui/src/app/admin/hoc/PropertiesProvider.js b/ui/src/app/admin/hoc/PropertiesProvider.js
index 95bbc5d04..5ab7bde75 100644
--- a/ui/src/app/admin/hoc/PropertiesProvider.js
+++ b/ui/src/app/admin/hoc/PropertiesProvider.js
@@ -30,7 +30,7 @@ function PropertiesProvider({ children, cache = 'no-cache' }) {
 
 function useProperties() {
     const { properties } = React.useContext(PropertiesContext);
-    return properties;
+    return properties.map((p, idx) => !p.category || p.category === '?' ? { ...p, category: 'Misc' } : p);;
 }
 
 function usePropertiesLoading() {