diff --git a/src/app/api/task/[id]/route.ts b/src/app/api/task/[id]/route.ts
index b402d56..07e9dc2 100644
--- a/src/app/api/task/[id]/route.ts
+++ b/src/app/api/task/[id]/route.ts
@@ -193,8 +193,8 @@ export async function POST(request: Request, context: { params: { id: string } }
             idProject: id,
             idDivision,
             title,
-            dateStart: new Date(moment(dateStart).format('YYYY-MM-DD')),
-            dateEnd: new Date(moment(dateEnd).format('YYYY-MM-DD')),
+            dateStart: new Date(dateStart),
+            dateEnd: new Date(dateEnd),
          },
          select: {
             id: true
diff --git a/src/app/api/task/detail/[id]/route.ts b/src/app/api/task/detail/[id]/route.ts
index 2d9f6dc..ddaa1f0 100644
--- a/src/app/api/task/detail/[id]/route.ts
+++ b/src/app/api/task/detail/[id]/route.ts
@@ -2,7 +2,6 @@ import { prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
 import { createLogUser } from "@/module/user";
 import _ from "lodash";
-import moment from "moment";
 import { NextResponse } from "next/server";
 
 
@@ -78,8 +77,6 @@ export async function DELETE(request: Request, context: { params: { id: string }
    }
 }
 
-
-
 // EDIT STATUS DETAIL TASK
 export async function PUT(request: Request, context: { params: { id: string } }) {
    try {
@@ -218,8 +215,8 @@ export async function POST(request: Request, context: { params: { id: string } }
          },
          data: {
             title,
-            dateStart: new Date(moment(dateStart).format('YYYY-MM-DD')),
-            dateEnd: new Date(moment(dateEnd).format('YYYY-MM-DD')),
+            dateStart: new Date(dateStart),
+            dateEnd: new Date(dateEnd),
          },
       });
 
diff --git a/src/app/api/task/route.ts b/src/app/api/task/route.ts
index 3cfa33a..b6bdd73 100644
--- a/src/app/api/task/route.ts
+++ b/src/app/api/task/route.ts
@@ -2,7 +2,6 @@ import { DIR, funUploadFile, prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
 import { createLogUser } from "@/module/user";
 import _, { ceil } from "lodash";
-import moment from "moment";
 import { NextResponse } from "next/server";
 
 
@@ -145,8 +144,8 @@ export async function POST(request: Request) {
             idDivision: idDivision,
             idProject: data.id,
             title: v.title,
-            dateStart: new Date(moment(v.dateStart).format('YYYY-MM-DD')),
-            dateEnd: new Date(moment(v.dateEnd).format('YYYY-MM-DD')),
+            dateStart: new Date(v.dateStart),
+            dateEnd: new Date(v.dateEnd),
          }))
 
          const insertTask = await prisma.divisionProjectTask.createMany({
diff --git a/src/module/task/lib/type_task.ts b/src/module/task/lib/type_task.ts
index bcadba5..ed88fb0 100644
--- a/src/module/task/lib/type_task.ts
+++ b/src/module/task/lib/type_task.ts
@@ -14,14 +14,14 @@ export interface IFormMemberTask {
 
 
 export interface IFormDateTask {
-   dateStart: Date,
-   dateEnd: Date,
+   dateStart: string,
+   dateEnd: string,
    title: string
 }
 
 export interface IFormAddDetailTask {
-   dateStart: Date,
-   dateEnd: Date,
+   dateStart: string,
+   dateEnd: string,
    title: string
    idDivision: string
 }
diff --git a/src/module/task/ui/add_detail_task.tsx b/src/module/task/ui/add_detail_task.tsx
index dead6ab..7feae9c 100644
--- a/src/module/task/ui/add_detail_task.tsx
+++ b/src/module/task/ui/add_detail_task.tsx
@@ -4,13 +4,13 @@ import LayoutModal from "@/module/_global/layout/layout_modal";
 import { useHookstate } from "@hookstate/core";
 import { Box, Button, Flex, Group, rem, SimpleGrid, Stack, Text, TextInput } from "@mantine/core";
 import { DatePicker } from "@mantine/dates";
+import { useShallowEffect } from "@mantine/hooks";
 import moment from "moment";
 import { useParams, useRouter } from "next/navigation";
 import { useState } from "react";
 import toast from "react-hot-toast";
 import { useWibuRealtime } from "wibu-realtime";
 import { funCreateDetailTask } from "../lib/api_task";
-import { useShallowEffect } from "@mantine/hooks";
 
 export default function AddDetailTask() {
    const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
@@ -59,8 +59,8 @@ export default function AddDetailTask() {
          setLoadingModal(true)
          const res = await funCreateDetailTask(param.detail, {
             title,
-            dateStart: (value[0] != null) ? value[0] : new Date,
-            dateEnd: (value[1] != null) ? value[1] : new Date,
+            dateStart: (value[0] != null) ? moment(value[0]).format('YYYY-MM-DD') : moment(new Date).format('YYYY-MM-DD'),
+            dateEnd: (value[1] != null) ? moment(value[1]).format('YYYY-MM-DD') : moment(new Date).format('YYYY-MM-DD'),
             idDivision: param.id
          })
 
diff --git a/src/module/task/ui/create_date_end_task.tsx b/src/module/task/ui/create_date_end_task.tsx
index 613b58c..0b769eb 100644
--- a/src/module/task/ui/create_date_end_task.tsx
+++ b/src/module/task/ui/create_date_end_task.tsx
@@ -29,8 +29,8 @@ export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boo
       return toast.error("Error! harus memasukkan judul tugas")
 
     onSet({
-      dateStart: value[0],
-      dateEnd: value[1],
+      dateStart: moment(value[0]).format('YYYY-MM-DD'),
+      dateEnd: moment(value[1]).format('YYYY-MM-DD'),
       title: title
     })
 
diff --git a/src/module/task/ui/edit_detail_task.tsx b/src/module/task/ui/edit_detail_task.tsx
index 882100d..13b34a0 100644
--- a/src/module/task/ui/edit_detail_task.tsx
+++ b/src/module/task/ui/edit_detail_task.tsx
@@ -38,8 +38,8 @@ export default function EditDetailTask() {
          setLoadingModal(true)
          const res = await funEditDetailTask(param.detail, {
             title: title,
-            dateStart: value[0],
-            dateEnd: value[1],
+            dateStart: moment(value[0]).format('YYYY-MM-DD'),
+            dateEnd: moment(value[1]).format('YYYY-MM-DD'),
          })
 
          if (res.success) {