diff --git a/packages/component-wizard/src/components/WizardFormStep.js b/packages/component-wizard/src/components/WizardFormStep.js
index b73c90c7f32df09b261eb4bbae8794452eff19e5..3e8c0a020bc413beaf229c50ba36cabe3359d536 100644
--- a/packages/component-wizard/src/components/WizardFormStep.js
+++ b/packages/component-wizard/src/components/WizardFormStep.js
@@ -8,6 +8,7 @@ import { reduxForm, formValueSelector, SubmissionError } from 'redux-form'
 import WizardStep from './WizardStep'
 import { autosaveRequest } from '../redux/autosave'
 
+let cachedVersion = ''
 const wizardSelector = formValueSelector('wizard')
 
 const onChange = (
@@ -19,7 +20,8 @@ const onChange = (
   const prev = pick(prevValues, formSectionKeys)
   const newValues = pick(values, formSectionKeys)
   // TODO: fix this if it sucks down the road
-  if (!isEqual(prev, newValues)) {
+  if (!isEqual(prev, newValues) && cachedVersion !== version.rev) {
+    cachedVersion = version.rev
     dispatch(autosaveRequest())
     dispatch(
       actions.updateFragment(project, {
diff --git a/packages/components-faraday/src/components/Files/Files.js b/packages/components-faraday/src/components/Files/Files.js
index 74f2a1b6fc05594dc2bf4da7c190d405f346e311..2ba71f3dac6f64cdff9a005e609568e44b4ec544 100644
--- a/packages/components-faraday/src/components/Files/Files.js
+++ b/packages/components-faraday/src/components/Files/Files.js
@@ -189,7 +189,7 @@ export default compose(
         ...files,
         [type]: files[type].filter(f => f.id !== id),
       }
-      setFiles(newFiles, type)
+      setFiles(newFiles)
       changeForm('wizard', 'files', files)
     },
   }),