diff --git a/lib/widgets/list_list.dart b/lib/widgets/list_list.dart
index eb77ba5..f12018f 100644
--- a/lib/widgets/list_list.dart
+++ b/lib/widgets/list_list.dart
@@ -665,7 +665,7 @@ class _ListListState extends State<ListList> {
   }
 
   Widget buildDueDateWidgetPreview(String newDueDate, String cardId){
-    DateTime dueDate = DateTime.parse(newDueDate);
+    DateTime dueDate = DateTime.parse(newDueDate).toLocal();
     DateTime now = DateTime.now();
     bool isOverdue = dueDate.isBefore(now);
 
@@ -681,7 +681,7 @@ class _ListListState extends State<ListList> {
 
 
     // Check if the due date result is already in the cache
-    if (dueDateCache.containsKey(dueDate)) {
+    if (dueDateCache.containsKey(dueDate.toString())) {
       // Cache the calculated due date result
       dueDateCache[dueDate.toString()] = result;
     }
@@ -695,7 +695,7 @@ class _ListListState extends State<ListList> {
 
         ///Update Card Due Date
         if(dateTime != null) {
-          await Provider.of<CardProvider>(context, listen: false).updateCardDueDate(cardId: cardId, newDueDate: dateTime.toString()).then((_) {
+          await Provider.of<CardProvider>(context, listen: false).updateCardDueDate(cardId: cardId, newDueDate: dateTime.toUtc().toString()).then((_) {
             // Call the onRefresh callback if it exists
             if (widget.onRefresh != null) {
               widget.onRefresh!();