diff --git a/src/RangePicker.tsx b/src/RangePicker.tsx
index bd0010b46..fc03655a7 100644
--- a/src/RangePicker.tsx
+++ b/src/RangePicker.tsx
@@ -307,7 +307,7 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
 
       // Fill disabled unit
       for (let i = 0; i < 2; i += 1) {
-        if (mergedDisabled[i] && !getValue(postValues, i) && !getValue(allowEmpty, i)) {
+        if (mergedDisabled[i] && !postValues && !getValue(postValues, i) && !getValue(allowEmpty, i)) {
           postValues = updateValues(postValues, generateConfig.getNow(), i);
         }
       }
diff --git a/tests/range.spec.tsx b/tests/range.spec.tsx
index c3d0df916..4e77570dd 100644
--- a/tests/range.spec.tsx
+++ b/tests/range.spec.tsx
@@ -1776,4 +1776,10 @@ describe('Picker.Range', () => {
     // No selected cell
     expect(document.querySelector('.rc-picker-cell-selected')).toBeFalsy();
   });
+
+  it('range picker should use the passed in default when part is disabled', () => {
+    render(<MomentRangePicker defaultValue={[null, null]} disabled={[false, true]} />);
+
+    expect(document.querySelectorAll('input')[1].value).toBeFalsy();
+  });
 });