diff --git a/lib/editor/components/timetable/TripSeriesModal.js b/lib/editor/components/timetable/TripSeriesModal.js
index 6db931ba0..e94b71969 100644
--- a/lib/editor/components/timetable/TripSeriesModal.js
+++ b/lib/editor/components/timetable/TripSeriesModal.js
@@ -66,6 +66,14 @@ const TripSeriesModal = (props: Props) => {
     setAutoBlockIdStart(1)
     setAutoBlockIdIncrement(1)
     setAutoBlockIdPrefix('')
+    setUseAutoBlockIds(false)
+    setUseAutoTripIds(false)
+  }
+
+  const _onClose = () => {
+    const { onClose } = props
+    clearState()
+    onClose()
   }
 
   const onClickGenerate = useCallback(() => {
@@ -130,6 +138,7 @@ const TripSeriesModal = (props: Props) => {
                     placeholder={messages('prefixPlaceholder')}
                     style={{width: '30%', marginRight: '5px'}}
                     type='text'
+                    value={autoTripIdPrefix}
                   />
                 -
                   <FormControl
@@ -198,7 +207,7 @@ const TripSeriesModal = (props: Props) => {
           {messages('generateTrips')}
         </Button>
         <Button
-          onClick={onClose}>
+          onClick={_onClose}>
           {messages('close')}
         </Button>
       </Footer>