diff --git a/app/src/protyle/render/av/date.ts b/app/src/protyle/render/av/date.ts
index 121084ea3..a1c90bfce 100644
--- a/app/src/protyle/render/av/date.ts
+++ b/app/src/protyle/render/av/date.ts
@@ -25,19 +25,19 @@ export const getDateHTML = (data: IAVTable, cellElements: HTMLElement[]) => {
     if (!cellValue) {
         hasEndDate = false;
     }
+    const isNotTime = !cellValue || cellValue?.value?.date?.isNotTime;
     let value = "";
     if (cellValue?.value?.date?.isNotEmpty) {
-        value = dayjs(cellValue.value.date.content).format(cellValue.value.date.isNotTime ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm");
+        value = dayjs(cellValue.value.date.content).format(isNotTime ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm");
     }
     let value2 = "";
     if (cellValue?.value?.date?.isNotEmpty2) {
-        value2 = dayjs(cellValue.value.date.content2).format(cellValue.value.date.isNotTime ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm");
+        value2 = dayjs(cellValue.value.date.content2).format(isNotTime ? "YYYY-MM-DD" : "YYYY-MM-DD HH:mm");
     }
-    const isNotTime = !cellValue || cellValue?.value?.date?.isNotTime;
     return `<div class="b3-menu__items">
 <div>
-    <input type="${(!cellValue || cellValue?.value?.date?.isNotTime) ? "date" : "datetime-local"}" max="9999-12-31 23:59" value="${value}" data-value="${value ? dayjs(cellValue.value.date.content).format("YYYY-MM-DD HH:mm") : ""}" class="b3-text-field fn__size200"><br>
-    <input type="${(!cellValue || cellValue?.value?.date?.isNotTime) ? "date" : "datetime-local"}" max="9999-12-31 23:59" value="${value2}" data-value="${value2 ? dayjs(cellValue.value.date.content2).format("YYYY-MM-DD HH:mm") : ""}" style="margin-top: 8px" class="b3-text-field fn__size200${hasEndDate ? "" : " fn__none"}">
+    <input type="${isNotTime ? "date" : "datetime-local"}" max="${isNotTime ? "9999-12-31" : "9999-12-31 23:59"}" value="${value}" data-value="${value ? dayjs(cellValue.value.date.content).format("YYYY-MM-DD HH:mm") : ""}" class="b3-text-field fn__size200"><br>
+    <input type="${isNotTime ? "date" : "datetime-local"}" max="${isNotTime ? "9999-12-31" : "9999-12-31 23:59"}" value="${value2}" data-value="${value2 ? dayjs(cellValue.value.date.content2).format("YYYY-MM-DD HH:mm") : ""}" style="margin-top: 8px" class="b3-text-field fn__size200${hasEndDate ? "" : " fn__none"}">
     <button class="b3-menu__separator"></button>
     <label class="b3-menu__item">
         <span>${window.siyuan.languages.endDate}</span>
@@ -47,7 +47,7 @@ export const getDateHTML = (data: IAVTable, cellElements: HTMLElement[]) => {
     <label class="b3-menu__item">
         <span>${window.siyuan.languages.includeTime}</span>
         <span class="fn__space fn__flex-1"></span>
-        <input type="checkbox" class="b3-switch fn__flex-center"${(!cellValue || cellValue?.value?.date?.isNotTime) ? "" : " checked"}>
+        <input type="checkbox" class="b3-switch fn__flex-center"${isNotTime ? "" : " checked"}>
     </label>
     <button class="b3-menu__separator"></button>
     <button class="b3-menu__item" data-type="clearDate">
@@ -111,11 +111,15 @@ export const bindDateEvent = (options: {
         if (inputElements[3].checked) {
             inputElements[0].setAttribute("type", "datetime-local");
             inputElements[1].setAttribute("type", "datetime-local");
+            inputElements[0].setAttribute("max", "9999-12-31 23:59");
+            inputElements[1].setAttribute("max", "9999-12-31 23:59");
             inputElements[0].value = inputElements[0].dataset.value;
             inputElements[1].value = inputElements[1].dataset.value;
         } else {
             inputElements[0].setAttribute("type", "date");
             inputElements[1].setAttribute("type", "date");
+            inputElements[0].setAttribute("max", "9999-12-31");
+            inputElements[1].setAttribute("max", "9999-12-31");
             inputElements[0].value = inputElements[0].dataset.value.substring(0, 10);
             inputElements[1].value = inputElements[1].dataset.value.substring(0, 10);
         }