diff --git a/web/packages/teleport/src/Discover/Discover.tsx b/web/packages/teleport/src/Discover/Discover.tsx
index 629aa6a754949..691f51e6f18cb 100644
--- a/web/packages/teleport/src/Discover/Discover.tsx
+++ b/web/packages/teleport/src/Discover/Discover.tsx
@@ -22,7 +22,7 @@ import { Box } from 'design';
 import { FeatureBox } from 'teleport/components/Layout';
 
 import { Navigation } from 'teleport/Discover/Navigation/Navigation';
-import { SelectResource } from 'teleport/Discover/SelectResource';
+import { SelectResource } from 'teleport/Discover/SelectResource/SelectResource';
 import cfg from 'teleport/config';
 
 import { findViewAtIndex } from './flow';
diff --git a/web/packages/teleport/src/components/EventRangePicker/Custom/Custom.jsx b/web/packages/teleport/src/components/EventRangePicker/Custom/Custom.jsx
index 775659404b96c..846c72182e7c5 100644
--- a/web/packages/teleport/src/components/EventRangePicker/Custom/Custom.jsx
+++ b/web/packages/teleport/src/components/EventRangePicker/Custom/Custom.jsx
@@ -17,11 +17,17 @@ limitations under the License.
 import React from 'react';
 import { isAfter, endOfDay, startOfDay, isSameDay, subMonths } from 'date-fns';
 import styled from 'styled-components';
-import DayPicker, { DateUtils } from 'react-day-picker';
+import dayPicker from 'react-day-picker/DayPicker';
 import 'react-day-picker/lib/style.css';
 import { Flex } from 'design';
 import { Close as CloseIcon } from 'design/Icon';
 
+// There is a vite issue with react-day-picker in production builds
+// https://github.com/vitejs/vite/issues/2139
+// TODO(ryan): After node v18 upgrade, swap to the Vite config approach instead of this one
+// also, we should look into upgrading react-day-picker
+const DayPicker = dayPicker.default || dayPicker;
+
 export default class CustomRange extends React.Component {
   constructor(props) {
     super();
@@ -51,7 +57,7 @@ export default class CustomRange extends React.Component {
       this.startSelecting = true;
     }
 
-    const range = DateUtils.addDayToRange(day, { from, end });
+    const range = dayPicker.DateUtils.addDayToRange(day, { from, end });
 
     if (range.from) {
       range.from = startOfDay(range.from);