diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index 3901ca9667a..56a17519b61 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -815,16 +815,16 @@ Aliases: `dateDiff`, `DATE_DIFF`, `timestampDiff`, `timestamp_diff`, `TIMESTAMP_
 - `unit` — The type of interval for result. [String](../../sql-reference/data-types/string.md).
     Possible values:
 
-    - `microsecond` (possible abbreviations: `us`, `u`)
-    - `millisecond` (possible abbreviations: `ms`)
-    - `second` (possible abbreviations: `ss`, `s`)
-    - `minute` (possible abbreviations: `mi`, `n`)
-    - `hour` (possible abbreviations: `hh`, `h`)
-    - `day` (possible abbreviations: `dd`, `d`)
-    - `week` (possible abbreviations: `wk`, `ww`)
-    - `month` (possible abbreviations: `mm`, `m`)
-    - `quarter` (possible abbreviations: `qq`, `q`)
-    - `year` (possible abbreviations: `yyyy`, `yy`)
+    - `microsecond` (possible abbreviations: `microseconds`, `us`, `u`)
+    - `millisecond` (possible abbreviations: `milliseconds`, `ms`)
+    - `second` (possible abbreviations: `seconds`, `ss`, `s`)
+    - `minute` (possible abbreviations: `minutes`, `mi`, `n`)
+    - `hour` (possible abbreviations: `hours`, `hh`, `h`)
+    - `day` (possible abbreviations: `days`, `dd`, `d`)
+    - `week` (possible abbreviations: `weeks`, `wk`, `ww`)
+    - `month` (possible abbreviations: `months`, `mm`, `m`)
+    - `quarter` (possible abbreviations: `quarters`, `qq`, `q`)
+    - `year` (possible abbreviations: `years`, `yyyy`, `yy`)
 
 - `startdate` — The first time value to subtract (the subtrahend). [Date](../../sql-reference/data-types/date.md), [Date32](../../sql-reference/data-types/date32.md), [DateTime](../../sql-reference/data-types/datetime.md) or [DateTime64](../../sql-reference/data-types/datetime64.md).
 
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index 6bfbbb7c735..c9c9020f068 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -381,25 +381,25 @@ public:
         const auto & timezone_x = extractTimeZoneFromFunctionArguments(arguments, 3, 1);
         const auto & timezone_y = extractTimeZoneFromFunctionArguments(arguments, 3, 2);
 
-        if (unit == "year" || unit == "yy" || unit == "yyyy")
+        if (unit == "year" || unit == "years" || unit == "yy" || unit == "yyyy")
             impl.template dispatchForColumns<ToRelativeYearNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "quarter" || unit == "qq" || unit == "q")
+        else if (unit == "quarter" || unit == "quarters" || unit == "qq" || unit == "q")
             impl.template dispatchForColumns<ToRelativeQuarterNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "month" || unit == "mm" || unit == "m")
+        else if (unit == "month" || unit == "months" || unit == "mm" || unit == "m")
             impl.template dispatchForColumns<ToRelativeMonthNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "week" || unit == "wk" || unit == "ww")
+        else if (unit == "week" || unit == "weeks" || unit == "wk" || unit == "ww")
             impl.template dispatchForColumns<ToRelativeWeekNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "day" || unit == "dd" || unit == "d")
+        else if (unit == "day" || unit == "days" || unit == "dd" || unit == "d")
             impl.template dispatchForColumns<ToRelativeDayNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "hour" || unit == "hh" || unit == "h")
+        else if (unit == "hour" || unit == "hours" || unit == "hh" || unit == "h")
             impl.template dispatchForColumns<ToRelativeHourNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "minute" || unit == "mi" || unit == "n")
+        else if (unit == "minute" || unit == "minutes" || unit == "mi" || unit == "n")
             impl.template dispatchForColumns<ToRelativeMinuteNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "second" || unit == "ss" || unit == "s")
+        else if (unit == "second" || unit == "seconds" || unit == "ss" || unit == "s")
             impl.template dispatchForColumns<ToRelativeSecondNumImpl<ResultPrecision::Extended>>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "millisecond" || unit == "ms")
+        else if (unit == "millisecond" || unit == "milliseconds" || unit == "ms")
             impl.template dispatchForColumns<ToRelativeSubsecondNumImpl<millisecond_multiplier>>(x, y, timezone_x, timezone_y, res->getData());
-        else if (unit == "microsecond" || unit == "us" || unit == "u")
+        else if (unit == "microsecond" || unit == "microseconds" || unit == "us" || unit == "u")
             impl.template dispatchForColumns<ToRelativeSubsecondNumImpl<microsecond_multiplier>>(x, y, timezone_x, timezone_y, res->getData());
         else
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
diff --git a/tests/queries/0_stateless/00538_datediff_plural_units.reference b/tests/queries/0_stateless/00538_datediff_plural_units.reference
new file mode 100644
index 00000000000..ebe63974df8
--- /dev/null
+++ b/tests/queries/0_stateless/00538_datediff_plural_units.reference
@@ -0,0 +1,10 @@
+-1
+-7
+-23
+-104
+-730
+-17520
+-1051200
+-63072000
+-63072000000
+-63072000000000
diff --git a/tests/queries/0_stateless/00538_datediff_plural_units.sql b/tests/queries/0_stateless/00538_datediff_plural_units.sql
new file mode 100644
index 00000000000..d1234155a56
--- /dev/null
+++ b/tests/queries/0_stateless/00538_datediff_plural_units.sql
@@ -0,0 +1,10 @@
+SELECT dateDiff('years', toDate('2017-12-31'), toDate('2016-01-01'));
+SELECT dateDiff('quarters', toDate('2017-12-31'), toDate('2016-01-01'));
+SELECT dateDiff('months', toDateTime('2017-12-31'), toDateTime('2016-01-01'));
+SELECT dateDiff('weeks', toDateTime('2017-12-31'), toDateTime('2016-01-01'));
+SELECT dateDiff('days', toDateTime('2017-12-31'), toDateTime('2016-01-01'));
+SELECT dateDiff('hours', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-01', 'UTC'));
+SELECT dateDiff('minutes', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-01', 'UTC'));
+SELECT dateDiff('seconds', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-01', 'UTC'));
+SELECT dateDiff('milliseconds', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-01', 'UTC'));
+SELECT dateDiff('microseconds', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-01', 'UTC'));