diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md
index b7cf014f638d9d97659277fde1a837017241dc03..f7babebb85469544fa04637d1e579c160e81097b 100644
--- a/cpp/CHANGELOG.md
+++ b/cpp/CHANGELOG.md
@@ -11,6 +11,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-587 - Count get wrong result after adding vectors and index built immediately
 - MS-599 - search wrong result when table created with metric_type: IP
 - MS-601 - Docker logs error caused by get CPUTemperature error
+- MS-622 - Delete vectors should be failed if date range is invalid
 
 ## Improvement
 - MS-552 - Add and change the easylogging library
diff --git a/cpp/src/server/grpc_impl/GrpcRequestTask.cpp b/cpp/src/server/grpc_impl/GrpcRequestTask.cpp
index dc2bd340ebc9556a52e625ac43400cf435d671c6..23ae84b33e8391edf1f6068487e354ea82408600 100644
--- a/cpp/src/server/grpc_impl/GrpcRequestTask.cpp
+++ b/cpp/src/server/grpc_impl/GrpcRequestTask.cpp
@@ -42,6 +42,8 @@ static const char* DQL_TASK_GROUP = "dql";
 static const char* DDL_DML_TASK_GROUP = "ddl_dml";
 static const char* PING_TASK_GROUP = "ping";
 
+constexpr int64_t DAY_SECONDS = 24 * 60 * 60;
+
 using DB_META = milvus::engine::meta::Meta;
 using DB_DATE = milvus::engine::meta::DateT;
 
@@ -78,8 +80,6 @@ IndexType(engine::EngineType type) {
     return map_type[type];
 }
 
-constexpr int64_t DAY_SECONDS = 24 * 60 * 60;
-
 Status
 ConvertTimeRangeToDBDates(const std::vector<::milvus::grpc::Range>& range_array, std::vector<DB_DATE>& dates) {
     dates.clear();
@@ -94,10 +94,10 @@ ConvertTimeRangeToDBDates(const std::vector<::milvus::grpc::Range>& range_array,
             return Status(SERVER_INVALID_TIME_RANGE, "Invalid time range: " + range.start_value());
         }
 
-        int64_t days = (tt_end > tt_start) ? (tt_end - tt_start) / DAY_SECONDS : (tt_start - tt_end) / DAY_SECONDS;
-        if (days == 0) {
+        int64_t days = (tt_end - tt_start) / DAY_SECONDS;
+        if (days <= 0) {
             return Status(SERVER_INVALID_TIME_RANGE,
-                          "Invalid time range: " + range.start_value() + " to " + range.end_value());
+                          "Invalid time range: The start-date should be smaller than end-date!");
         }
 
         // range: [start_day, end_day)