diff --git a/packages/date-picker/src/vaadin-infinite-scroller.js b/packages/date-picker/src/vaadin-infinite-scroller.js
index 7798ec6aa9d..58e04c010fb 100644
--- a/packages/date-picker/src/vaadin-infinite-scroller.js
+++ b/packages/date-picker/src/vaadin-infinite-scroller.js
@@ -308,7 +308,7 @@ export class InfiniteScroller extends HTMLElement {
 
   /** @private */
   _createPool() {
-    const container = this.getBoundingClientRect();
+    const viewportHeight = this.innerHeight;
     this._buffers.forEach((buffer) => {
       for (let i = 0; i < this.bufferSize; i++) {
         const itemWrapper = document.createElement('div');
@@ -326,7 +326,7 @@ export class InfiniteScroller extends HTMLElement {
         this.appendChild(itemWrapper);
 
         // Only stamp the visible instances first
-        if (this._isVisible(itemWrapper, container)) {
+        if (this.itemHeight * i <= viewportHeight) {
           this._ensureStampedInstance(itemWrapper);
         }
       }
diff --git a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-dropdown.png b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-dropdown.png
index b945fa45eb1..a2a83f3807b 100644
Binary files a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-dropdown.png and b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-dropdown.png differ
diff --git a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-fullscreen.png b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-fullscreen.png
index a3ee95bb4ac..c1a5a9e1718 100644
Binary files a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-fullscreen.png and b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-fullscreen.png differ
diff --git a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-week-numbers.png b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-week-numbers.png
index ae2d4a4e034..33b6aecea17 100644
Binary files a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-week-numbers.png and b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/ltr-week-numbers.png differ
diff --git a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-dropdown.png b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-dropdown.png
index 4a9fcc4b0dd..ccb905b68ab 100644
Binary files a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-dropdown.png and b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-dropdown.png differ
diff --git a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-fullscreen.png b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-fullscreen.png
index 9c14922386d..f45145327a9 100644
Binary files a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-fullscreen.png and b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-fullscreen.png differ
diff --git a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-week-numbers.png b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-week-numbers.png
index 93fb1e22529..2c502a79203 100644
Binary files a/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-week-numbers.png and b/packages/date-picker/test/visual/lumo/screenshots/date-picker/baseline/rtl-week-numbers.png differ