diff --git a/src/utils/createComponentWithOrderedProps.ts b/src/utils/createComponentWithOrderedProps.ts
index 1a22edb7..be2a5a23 100644
--- a/src/utils/createComponentWithOrderedProps.ts
+++ b/src/utils/createComponentWithOrderedProps.ts
@@ -14,7 +14,9 @@ export default function createComponentWithOrderedProps<P extends {}, E extends
     }
 
     for (const name of names) {
-      orderedProps[name] = props[name];
+      if (props.hasOwnProperty(name)) {
+        orderedProps[name] = props[name];
+      }
     }
 
     orderedProps.ref = ref;
diff --git a/test/DateTimePicker.spec.tsx b/test/DateTimePicker.spec.tsx
index dd648aa6..0df22f4f 100644
--- a/test/DateTimePicker.spec.tsx
+++ b/test/DateTimePicker.spec.tsx
@@ -17,4 +17,16 @@ describe('DatePicker', () => {
 
     expect(element).to.have.value(value);
   });
+
+  it('should not override value set on DOM element on rerender', () => {
+    const { container, rerender } = render(<DateTimePicker label="Foo" />);
+
+    const element = container.querySelector('vaadin-date-time-picker');
+    expect(element).to.exist;
+    element!.value = '2020-01-01T15:00';
+    expect(element).to.have.value('2020-01-01T15:00');
+
+    rerender(<DateTimePicker label="Foo" />);
+    expect(element).to.have.value('2020-01-01T15:00');
+  });
 });