diff --git a/AUTHORS b/AUTHORS
index a04907448..7e85d72c1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -337,3 +337,4 @@ suggestions:
   tom-doerr
   ad-si
   Adrien Lemaire
+  Wray Zheng
diff --git a/ChangeLog b/ChangeLog
index c91784531..face46372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,8 @@
            Thanks to Chad Phillips
 - #2176    How to get the full list of tags ?
            Thanks to Adrien Lemaire
+- #2091    duration of task is set to a wrong and extremely big value
+           Thanks to Wray Zheng
 - Added 'juhannus' as a synonym for 'midsommarafton'
            Thanks to Lynoure Braakman
 - Deprecated the 'DUETODAY' virtual tag, which is a synonym for the 'TODAY'
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 8cdf6a5c1..419dc72ce 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -170,10 +170,14 @@ std::string taskInfoDifferences (
     }
     else if (name == "start")
     {
-      out << format ("{1} deleted (duration: {2}).",
-                     Lexer::ucFirst (name),
-                     Duration (current_timestamp - last_timestamp).format ())
-          << "\n";
+      if (last_timestamp > 0)
+        out << format ("{1} deleted (duration: {2}).",
+                       Lexer::ucFirst (name),
+                       Duration (current_timestamp - last_timestamp).format ())
+            << "\n";
+      else
+        out << format ("{1} deleted.", Lexer::ucFirst (name))
+            << "\n";
     }
     else
     {