diff --git a/packages/redux-devtools-inspector-monitor-test-tab/src/index.tsx b/packages/redux-devtools-inspector-monitor-test-tab/src/index.tsx
index 90e74a71..2ce887d5 100644
--- a/packages/redux-devtools-inspector-monitor-test-tab/src/index.tsx
+++ b/packages/redux-devtools-inspector-monitor-test-tab/src/index.tsx
@@ -64,17 +64,17 @@ export class TestTab<S, A extends Action<string>> extends Component<
     this.setState({ dialogStatus: null });
   };
 
-  handleSubmit = ({ formData: template }: { formData: Template }) => {
+  handleSubmit = ({ formData: template }: { formData?: Template }) => {
     const { templates = getDefaultTemplates(), selected = 0 } =
       this.getPersistedState();
     if (this.state.dialogStatus === 'Add') {
       this.updateState({
         selected: templates.length,
-        templates: [...templates, template],
+        templates: [...templates, template!],
       });
     } else {
       const editedTemplates = [...templates];
-      editedTemplates[selected] = template;
+      editedTemplates[selected] = template!;
       this.updateState({
         templates: editedTemplates,
       });
diff --git a/packages/redux-devtools-ui/src/Form/Form.tsx b/packages/redux-devtools-ui/src/Form/Form.tsx
index 4af61dd6..17e56edd 100644
--- a/packages/redux-devtools-ui/src/Form/Form.tsx
+++ b/packages/redux-devtools-ui/src/Form/Form.tsx
@@ -9,7 +9,7 @@ import customWidgets from './widgets';
 
 const FormContainer = createStyledComponent(styles, JSONSchemaForm);
 
-export interface Props<T> extends FormProps<T> {
+export interface Props<T> extends Omit<FormProps<T>, 'validator'> {
   children?: React.ReactNode;
   submitText?: string;
   primaryButton?: boolean;