diff --git a/projects/angular-formio/src/FormioBaseComponent.ts b/projects/angular-formio/src/FormioBaseComponent.ts
index 1a6229ae..a632eec0 100644
--- a/projects/angular-formio/src/FormioBaseComponent.ts
+++ b/projects/angular-formio/src/FormioBaseComponent.ts
@@ -120,7 +120,7 @@ export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
   setForm(form: FormioForm) {
     this.form = form;
     if (this.formio) {
-      this.formio.destroy();
+      this.formio.destroy(true);
     }
 
     if (this.form.title) {
@@ -285,24 +285,24 @@ export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
     }
   }
 
-  setFormFromSrc() {
+   setFormFromSrc() {
      // if a submission is provided, load it first to set required form revision.
-        if (
-          isEmpty(this.submission) &&
-          this.service &&
-          this.service.formio.submissionId
-        ) {
-          this.service.loadSubmission().subscribe(
-            (submission: any) => {
+     if (
+       isEmpty(this.submission) &&
+       this.service &&
+       this.service.formio.submissionId
+     ) {
+       this.service.loadSubmission().subscribe(
+         (submission: any) => {
            this.loadForm(() => {
-              if (this.readOnly) {
-                this.formio.options.readOnly = true;
-              }
-              this.submission = this.formio.submission = submission;
+             if (this.readOnly) {
+               this.formio.options.readOnly = true;
+             }
+             this.submission = this.formio.submission = submission;
            });
-            },
-            err => this.onError(err)
-          );
+         },
+         err => this.onError(err)
+       );
      } else {
        this.loadForm();
      }
@@ -326,7 +326,7 @@ export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
 
   ngOnDestroy() {
     if (this.formio) {
-      this.formio.destroy();
+      this.formio.destroy(true);
     }
   }
 
diff --git a/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts b/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts
index 759bc49b..9e98c9a6 100644
--- a/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts
+++ b/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts
@@ -24,9 +24,9 @@ import { CustomTagsService } from '../../custom-tags.service';
 
 /* tslint:disable */
 @Component({
-  selector: 'form-builder',
-  templateUrl: './formbuilder.component.html',
-  styleUrls: ['../../../../../node_modules/@formio/js/dist/formio.builder.min.css'],
+    selector: 'form-builder',
+    templateUrl: './formbuilder.component.html',
+    styleUrls: ['../../../../../node_modules/@formio/js/dist/formio.builder.min.css'],
     encapsulation: ViewEncapsulation.None
 })
 /* tslint:enable */
@@ -207,7 +207,7 @@ export class FormBuilderComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     if (this.formio) {
-      this.formio.destroy();
+      this.formio.destroy(true);
     }
   }
 }