diff --git a/imports/client/components/PuzzleModalForm.tsx b/imports/client/components/PuzzleModalForm.tsx
index 757ae9299..72ae76218 100644
--- a/imports/client/components/PuzzleModalForm.tsx
+++ b/imports/client/components/PuzzleModalForm.tsx
@@ -177,10 +177,15 @@ const PuzzleModalForm = React.forwardRef(
           } else {
             setSubmitState(PuzzleModalFormSubmitState.IDLE);
             setErrorMessage("");
+            setTitle("");
             setTitleDirty(false);
+            setUrl("");
             setUrlDirty(false);
+            setTags([]);
             setTagsDirty(false);
+            setExpectedAnswerCount(1);
             setExpectedAnswerCountDirty(false);
+            setDocType("spreadsheet");
             callback();
           }
         });