diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs
index 9e03ec800c..69ebf0feff 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs
@@ -270,12 +270,12 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
 
         if (options.MinDate != null)
         {
-            attrList.Add("data-min-date", options.MinDate);
+            attrList.Add("data-min-date", options.MinDate?.ToString("O"));
         }
 
         if (options.MaxDate != null)
         {
-            attrList.Add("data-max-date", options.MaxDate);
+            attrList.Add("data-max-date", options.MaxDate?.ToString("O"));
         }
 
         if (options.MaxSpan != null)
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js
index b5d2dec80d..a67ec1401b 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js
@@ -205,7 +205,7 @@
                 var today = moment();
                 $dateRangePicker.setStartDate(today);
                 $dateRangePicker.setEndDate(today);
-                
+
                 if(options.singleDatePicker && options.autoApply){
                     $dateRangePicker.clickApply();
                 }else{
@@ -366,6 +366,14 @@
             });
         }
 
+        if (options.maxDate){
+            options.maxDate = convertToMoment(options.maxDate, options);
+        }
+
+        if (options.minDate){
+            options.minDate = convertToMoment(options.minDate, options);
+        }
+
         if (typeof options.template !== 'string' && !(options.template instanceof $))
             options.template =
                 '<div class="daterangepicker">' +
@@ -433,13 +441,13 @@
 
         return '';
     }
-    
+
     function createInitialAbpDate(date, options) {
         date = convertToMoment(date, options, undefined, options.isUtc);
         if (options.isUtc) {
             date = date.local();
         }
-        
+
         return AbpDate(date, options);
     }
 
@@ -468,8 +476,9 @@
                 var singleOpenAndClearButton = options.singleOpenAndClearButton && $clearButton.length > 0 && $openButton.length > 0;
 
                 var startDate = createInitialAbpDate(options.startDate || options.date || (options.autoUpdateInput ? new Date() : undefined), options);
+
                 var oldStartDate = AbpDate(undefined, options);
-                
+
                 var endDate = createInitialAbpDate(options.endDate || (options.autoUpdateInput ? new Date() : undefined), options);
                 var oldEndDate = AbpDate(undefined, options);
 
@@ -583,7 +592,7 @@
                     }else{
                         picker.setStartDate(convertToMoment(startDate, options, options.inputDateFormat));
                     }
-                    
+
                     if(singleDatePicker){
                         picker.setEndDate(picker.startDate);
                     }else if(isEmptyDate(endDate, options)){