diff --git a/bootstrapper/forms/formsNg2.html b/bootstrapper/forms/formsNg2.html
index 15368e1e..f1459008 100644
--- a/bootstrapper/forms/formsNg2.html
+++ b/bootstrapper/forms/formsNg2.html
@@ -27,7 +27,7 @@ <h5>Form with names</h5>
 	<rlButtonSubmit rightAligned="true">Submit right</rlButtonSubmit>
 </rlForm>
 <h5>Autosave form</h5>
-<rlBusy [loading]="autosaveAction.saving || autosaveAction.complete"></rlBusy>
+<rlBusy [loading]="(autosaveAction.saving$ | async) || (autosaveAction.complete$ | async)"></rlBusy>
 <rlForm #autosaveForm [save]="waitCallback" rlAutosave [saveWhenInvalid]="true">
 	<rlTextbox name="textbox1" label="Autosave textbox" rlRequired="Required textbox"></rlTextbox>
 </rlForm>
diff --git a/source/behaviors/autosave/autosave.ts b/source/behaviors/autosave/autosave.ts
index f32ba9cd..3e56cb21 100644
--- a/source/behaviors/autosave/autosave.ts
+++ b/source/behaviors/autosave/autosave.ts
@@ -34,7 +34,7 @@ export class AutosaveDirective implements AfterViewInit {
 	}
 
 	setDebounce = (): void => {
-		if (!this.timer && (this.saveWhenInvalid || this.form.validate())) {
+		if (!this.timer && this.form.dirty && (this.saveWhenInvalid || this.form.validate())) {
 			this.timer = this.timeoutService.setTimeout(this.autosave, DEFAULT_AUTOSAVE_DEBOUNCE)
 											.catch(() => null);
 		}