diff --git a/interface/src/app/main/DevicesDialog.tsx b/interface/src/app/main/DevicesDialog.tsx
index 2ef5b7de8..96d095ad6 100644
--- a/interface/src/app/main/DevicesDialog.tsx
+++ b/interface/src/app/main/DevicesDialog.tsx
@@ -84,10 +84,9 @@ const DevicesDialog = ({
       } else {
         await validate(validator, editItem);
       }
+      onSave(editItem);
     } catch (error) {
       setFieldErrors((error as ValidationError).fieldErrors);
-    } finally {
-      onSave(editItem);
     }
   };
 
diff --git a/interface/src/app/settings/ApplicationSettings.tsx b/interface/src/app/settings/ApplicationSettings.tsx
index 876416e18..9f2a63819 100644
--- a/interface/src/app/settings/ApplicationSettings.tsx
+++ b/interface/src/app/settings/ApplicationSettings.tsx
@@ -140,10 +140,9 @@ const ApplicationSettings = () => {
     try {
       setFieldErrors(undefined);
       await validate(createSettingsValidator(data), data);
+      await saveData();
     } catch (error) {
       setFieldErrors((error as ValidationError).fieldErrors);
-    } finally {
-      await saveData();
     }
   };