diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index b0e44f5e..744b5579 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -3,7 +3,7 @@ import TaskPriorityIcon from '@/components/Icons/TaskPriorityIcon.vue'
 import { usersStore } from '@/stores/users'
 import { gemoji } from 'gemoji'
 import { useTimeAgo } from '@vueuse/core'
-import { toast, convertToUserTimezone, luxonDate } from 'frappe-ui'
+import { toast, dayjsLocal, dayjs } from 'frappe-ui'
 import { h } from 'vue'
 
 export function createToast(options) {
@@ -39,8 +39,9 @@ export function formatTime(seconds) {
 }
 
 export function formatDate(date, format, onlyDate = false, onlyTime = false) {
+  if (!date) return ''
   format = getFormat(date, format, onlyDate, onlyTime, false)
-  return convertToUserTimezone(date, format)
+  return dayjsLocal(date).format(format)
 }
 
 export function getFormat(
@@ -52,16 +53,19 @@ export function getFormat(
 ) {
   if (!date) return ''
   let dateFormat =
-    window.sysdefaults.date_format.replace('mm', 'MM') || 'yyyy-MM-dd'
+    window.sysdefaults.date_format
+      .replace('mm', 'MM')
+      .replace('yyyy', 'YYYY')
+      .replace('dd', 'DD') || 'YYYY-MM-DD'
   let timeFormat = window.sysdefaults.time_format || 'HH:mm:ss'
-  format = format || 'EEE, MMM d, yyyy h:mm a'
+  format = format || 'ddd, MMM d, YYYY h:mm a'
 
   if (onlyDate) format = dateFormat
   if (onlyTime) format = timeFormat
   if (onlyTime && onlyDate) format = `${dateFormat} ${timeFormat}`
 
   if (withDate) {
-    return luxonDate(date).toFormat(format)
+    return dayjs(date).format(format)
   }
   return format
 }