diff --git a/lib/src/_shared/hooks/usePickerState.ts b/lib/src/_shared/hooks/usePickerState.ts
index f361e2c69..944c696ff 100644
--- a/lib/src/_shared/hooks/usePickerState.ts
+++ b/lib/src/_shared/hooks/usePickerState.ts
@@ -75,16 +75,19 @@ export function usePickerState(props: BasePickerProps, options: StateHookOptions
       onChange: (newDate: MaterialUiPickersDate, isFinish = true) => {
         setPickerDate(newDate);
 
-        if (variant === 'inline' || variant === 'static') {
-          onChange(newDate);
-        }
-
         if (isFinish && autoOk) {
           acceptDate(newDate);
+          return;
+        }
+
+        // simulate autoOk, but do not close the modal
+        if (variant === 'inline' || variant === 'static') {
+          onChange(newDate);
+          onAccept && onAccept(newDate);
         }
       },
     }),
-    [acceptDate, autoOk, onChange, pickerDate, variant]
+    [acceptDate, autoOk, onAccept, onChange, pickerDate, variant]
   );
 
   const validationError = validate(value, utils, props);