diff --git a/course-matrix/frontend/src/pages/TimetableBuilder/CreateCustomSetting.tsx b/course-matrix/frontend/src/pages/TimetableBuilder/CreateCustomSetting.tsx
index dd873cd0..499f5121 100644
--- a/course-matrix/frontend/src/pages/TimetableBuilder/CreateCustomSetting.tsx
+++ b/course-matrix/frontend/src/pages/TimetableBuilder/CreateCustomSetting.tsx
@@ -166,8 +166,15 @@ const CreateCustomSetting = ({
                       <FormLabel>Restriction Type</FormLabel>
                       <FormControl>
                         <Select
-                          onValueChange={field.onChange}
-                          value={field.value}
+                          onValueChange={(value) => {
+                            field.onChange(value);
+                            // Reset values when toggle type
+                            restrictionForm.setValue("days", []);
+                            restrictionForm.setValue("startTime", undefined);
+                            restrictionForm.setValue("endTime", undefined);
+                            restrictionForm.setValue("maxGap", undefined);
+                            restrictionForm.setValue("numDays", undefined);
+                          }}
                           defaultValue={""}
                         >
                           <SelectTrigger className="w-[320px]">