diff --git a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html b/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html
index 248aa995469..1137117e33a 100644
--- a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html
+++ b/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.html
@@ -4,8 +4,7 @@
 </edit-component-submit-button>
 <edit-component-max-submit
   *ngIf="component.content.showSubmitButton"
-  [(maxSubmitCount)]="component.content.maxSubmitCount"
-  (maxSubmitCountChange)="maxSubmitCountChanged($event)"
+  [componentContent]="component.content"
 >
 </edit-component-max-submit>
 <edit-component-default-feedback [componentContent]="component.content">
diff --git a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.ts b/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.ts
index 025a636d54d..80042f92a3c 100644
--- a/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.ts
+++ b/src/app/authoring-tool/edit-common-advanced/edit-common-advanced.component.ts
@@ -20,10 +20,6 @@ export class EditCommonAdvancedComponent implements OnInit {
     this.componentChanged();
   }
 
-  maxSubmitCountChanged(maxSubmitCount: number): void {
-    this.componentChanged();
-  }
-
   componentChanged(): void {
     this.projectService.nodeChanged();
   }
diff --git a/src/app/authoring-tool/edit-component-field.component.ts b/src/app/authoring-tool/edit-component-field.component.ts
index 9032422f8fe..28f1a5e7ba4 100644
--- a/src/app/authoring-tool/edit-component-field.component.ts
+++ b/src/app/authoring-tool/edit-component-field.component.ts
@@ -5,9 +5,8 @@ import { TeacherProjectService } from '../../assets/wise5/services/teacherProjec
 
 @Directive()
 export abstract class EditComponentFieldComponent {
-  @Input()
-  componentContent: any;
-  inputChanged: Subject<string> = new Subject<string>();
+  @Input() componentContent: any;
+  inputChanged: Subject<any> = new Subject<any>();
   inputChangedSubscription: Subscription;
 
   constructor(private ProjectService: TeacherProjectService) {}
diff --git a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.html b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.html
index abd54cf6cb9..1ea6e055a8d 100644
--- a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.html
+++ b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.html
@@ -5,8 +5,8 @@
       matInput
       type="number"
       min="1"
-      [(ngModel)]="maxSubmitCount"
-      (ngModelChange)="maxSubmitCountDebouncer.next($event)"
+      [(ngModel)]="componentContent.maxSubmitCount"
+      (ngModelChange)="inputChanged.next($event)"
     />
   </mat-form-field>
 </div>
diff --git a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.spec.ts b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.spec.ts
index 8736f5605d4..6c77c79576f 100644
--- a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.spec.ts
+++ b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.spec.ts
@@ -1,7 +1,9 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-
 import { EditComponentMaxSubmitComponent } from './edit-component-max-submit.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TeacherProjectService } from '../../../assets/wise5/services/teacherProjectService';
+import { StudentTeacherCommonServicesModule } from '../../student-teacher-common-services.module';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
 
 describe('EditComponentMaxSubmitComponent', () => {
   let component: EditComponentMaxSubmitComponent;
@@ -10,6 +12,8 @@ describe('EditComponentMaxSubmitComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       declarations: [EditComponentMaxSubmitComponent],
+      imports: [HttpClientTestingModule, StudentTeacherCommonServicesModule],
+      providers: [TeacherProjectService],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   });
@@ -17,6 +21,7 @@ describe('EditComponentMaxSubmitComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(EditComponentMaxSubmitComponent);
     component = fixture.componentInstance;
+    component.componentContent = {};
     fixture.detectChanges();
   });
 
diff --git a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts
index eb547794949..7021e716562 100644
--- a/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts
+++ b/src/app/authoring-tool/edit-component-max-submit/edit-component-max-submit.component.ts
@@ -1,33 +1,9 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Subject, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import { Component } from '@angular/core';
+import { EditComponentFieldComponent } from '../edit-component-field.component';
 
 @Component({
   selector: 'edit-component-max-submit',
   templateUrl: './edit-component-max-submit.component.html',
   styleUrls: ['./edit-component-max-submit.component.scss']
 })
-export class EditComponentMaxSubmitComponent implements OnInit {
-  @Input()
-  maxSubmitCount: number;
-
-  @Output()
-  maxSubmitCountChange: EventEmitter<number> = new EventEmitter<number>();
-
-  maxSubmitCountDebouncer: Subject<number> = new Subject<number>();
-  maxSubmitCountDebouncerSubscription: Subscription;
-
-  constructor() {}
-
-  ngOnInit(): void {
-    this.maxSubmitCountDebouncerSubscription = this.maxSubmitCountDebouncer
-      .pipe(debounceTime(1000), distinctUntilChanged())
-      .subscribe(() => {
-        this.maxSubmitCountChange.emit(this.maxSubmitCount);
-      });
-  }
-
-  ngOnDestroy(): void {
-    this.maxSubmitCountDebouncerSubscription.unsubscribe();
-  }
-}
+export class EditComponentMaxSubmitComponent extends EditComponentFieldComponent {}
diff --git a/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html b/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html
index 2376a8c10bd..b40d547f92c 100644
--- a/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html
+++ b/src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html
@@ -12,10 +12,7 @@
       type="text"
     />
   </mat-form-field>
-  <edit-component-max-submit
-    [(maxSubmitCount)]="componentContent.maxSubmitCount"
-    (maxSubmitCountChange)="componentChanged()"
-  ></edit-component-max-submit>
+  <edit-component-max-submit [componentContent]="componentContent"></edit-component-max-submit>
   <mat-checkbox
     color="primary"
     [(ngModel)]="componentContent.isComputerAvatarEnabled"
diff --git a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
index beec5417e40..a4934ca1f37 100644
--- a/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
+++ b/src/assets/wise5/components/draw/edit-draw-advanced/edit-draw-advanced.component.html
@@ -7,8 +7,7 @@
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
 <edit-component-max-submit
   *ngIf="componentContent.showSubmitButton"
-  [(maxSubmitCount)]="componentContent.maxSubmitCount"
-  (maxSubmitCountChange)="maxSubmitCountChanged($event)"
+  [componentContent]="componentContent"
 >
 </edit-component-max-submit>
 <edit-component-default-feedback [componentContent]="componentContent">
diff --git a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
index 40769dee834..d5824eb085a 100644
--- a/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
+++ b/src/assets/wise5/components/graph/edit-graph-advanced/edit-graph-advanced.component.html
@@ -172,8 +172,7 @@
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
 <edit-component-max-submit
   *ngIf="componentContent.showSubmitButton"
-  [(maxSubmitCount)]="componentContent.maxSubmitCount"
-  (maxSubmitCountChange)="maxSubmitCountChanged($event)"
+  [componentContent]="componentContent"
 >
 </edit-component-max-submit>
 <edit-component-default-feedback [componentContent]="componentContent">
diff --git a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
index b976013395c..28e91fc6bee 100644
--- a/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
+++ b/src/assets/wise5/components/label/edit-label-advanced/edit-label-advanced.component.html
@@ -7,8 +7,7 @@
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
 <edit-component-max-submit
   *ngIf="componentContent.showSubmitButton"
-  [(maxSubmitCount)]="componentContent.maxSubmitCount"
-  (maxSubmitCountChange)="maxSubmitCountChanged($event)"
+  [componentContent]="componentContent"
 >
 </edit-component-max-submit>
 <edit-component-default-feedback [componentContent]="componentContent">
diff --git a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
index 9fc0747ea72..864fabfba1a 100644
--- a/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
+++ b/src/assets/wise5/components/match/edit-match-advanced/edit-match-advanced.component.html
@@ -25,8 +25,7 @@
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
 <edit-component-max-submit
   *ngIf="componentContent.showSubmitButton"
-  [(maxSubmitCount)]="componentContent.maxSubmitCount"
-  (maxSubmitCountChange)="maxSubmitCountChanged($event)"
+  [componentContent]="componentContent"
 >
 </edit-component-max-submit>
 <edit-component-default-feedback [componentContent]="componentContent">
diff --git a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
index daf40e9f511..7e1621eb9ef 100644
--- a/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
+++ b/src/assets/wise5/components/multipleChoice/edit-multiple-choice-advanced/edit-multiple-choice-advanced.component.html
@@ -13,8 +13,7 @@
 <edit-component-submit-button [componentContent]="componentContent"> </edit-component-submit-button>
 <edit-component-max-submit
   *ngIf="componentContent.showSubmitButton"
-  [(maxSubmitCount)]="componentContent.maxSubmitCount"
-  (maxSubmitCountChange)="maxSubmitCountChanged($event)"
+  [componentContent]="componentContent"
 >
 </edit-component-max-submit>
 <edit-component-default-feedback [componentContent]="componentContent">
diff --git a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
index 9417c7865a3..4113f3590a9 100644
--- a/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
+++ b/src/assets/wise5/components/table/edit-table-advanced/edit-table-advanced.component.html
@@ -255,8 +255,7 @@
 </div>
 <edit-component-max-submit
   *ngIf="componentContent.showSubmitButton"
-  [(maxSubmitCount)]="componentContent.maxSubmitCount"
-  (maxSubmitCountChange)="maxSubmitCountChanged($event)"
+  [componentContent]="componentContent"
 >
 </edit-component-max-submit>
 <edit-component-default-feedback [componentContent]="componentContent">
diff --git a/src/messages.xlf b/src/messages.xlf
index 3741672061c..94cbba6678e 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -17074,7 +17074,7 @@ Category Name: <x id="PH_1" equiv-text="categoryName"/></source>
         <source>Enable Computer Avatar</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/components/dialogGuidance/dialog-guidance-authoring/dialog-guidance-authoring.component.html</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c50661356b4d4941e7eb9b151c65f5f5897d236e" datatype="html">