diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 84767c6347e7..d943886982e4 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -365,6 +365,10 @@ function Button(
                     if (shouldEnableHapticFeedback) {
                         HapticFeedback.press();
                     }
+
+                    if (isDisabled || isLoading) {
+                        return; // Prevent the onPress from being triggered when the button is disabled or in a loading state
+                    }
                     return onPress(event);
                 }}
                 onLongPress={(event) => {
diff --git a/src/components/DatePicker/CalendarPicker/ArrowIcon.tsx b/src/components/DatePicker/CalendarPicker/ArrowIcon.tsx
index 9bb61931d55a..5c58ed22f6fa 100644
--- a/src/components/DatePicker/CalendarPicker/ArrowIcon.tsx
+++ b/src/components/DatePicker/CalendarPicker/ArrowIcon.tsx
@@ -14,20 +14,14 @@ type ArrowIconProps = {
 
     /** Specifies direction of icon */
     direction?: ValueOf<typeof CONST.DIRECTION>;
-
-    /** TestID for testing */
-    testID?: string;
 };
 
-function ArrowIcon({disabled = false, direction = CONST.DIRECTION.RIGHT, testID}: ArrowIconProps) {
+function ArrowIcon({disabled = false, direction = CONST.DIRECTION.RIGHT}: ArrowIconProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     return (
-        <View
-            style={[styles.p1, StyleUtils.getDirectionStyle(direction), disabled ? styles.buttonOpacityDisabled : {}]}
-            testID={testID}
-        >
+        <View style={[styles.p1, StyleUtils.getDirectionStyle(direction), disabled ? styles.buttonOpacityDisabled : {}]}>
             <Icon
                 fill={theme.icon}
                 src={Expensicons.ArrowRight}
diff --git a/src/components/DatePicker/CalendarPicker/index.tsx b/src/components/DatePicker/CalendarPicker/index.tsx
index c3a0aa40062a..abe86509630b 100644
--- a/src/components/DatePicker/CalendarPicker/index.tsx
+++ b/src/components/DatePicker/CalendarPicker/index.tsx
@@ -179,6 +179,7 @@ function CalendarPicker({
                     </Text>
                     <PressableWithFeedback
                         shouldUseAutoHitSlop={false}
+                        testID="prev-month-arrow"
                         disabled={!hasAvailableDatesPrevMonth}
                         onPress={moveToPrevMonth}
                         hoverDimmingValue={1}
@@ -187,20 +188,17 @@ function CalendarPicker({
                         <ArrowIcon
                             disabled={!hasAvailableDatesPrevMonth}
                             direction={CONST.DIRECTION.LEFT}
-                            testID="prev-month-arrow"
                         />
                     </PressableWithFeedback>
                     <PressableWithFeedback
                         shouldUseAutoHitSlop={false}
+                        testID="next-month-arrow"
                         disabled={!hasAvailableDatesNextMonth}
                         onPress={moveToNextMonth}
                         hoverDimmingValue={1}
                         accessibilityLabel={translate('common.next')}
                     >
-                        <ArrowIcon
-                            disabled={!hasAvailableDatesNextMonth}
-                            testID="next-month-arrow"
-                        />
+                        <ArrowIcon disabled={!hasAvailableDatesNextMonth} />
                     </PressableWithFeedback>
                 </View>
             </View>
@@ -227,7 +225,7 @@ function CalendarPicker({
                         const isDisabled = !day || isBeforeMinDate || isAfterMaxDate;
                         const isSelected = !!day && isSameDay(parseISO(value.toString()), new Date(currentYearView, currentMonthView, day));
                         const handleOnPress = () => {
-                            if (!day) {
+                            if (!day || isDisabled) {
                                 return;
                             }
 
diff --git a/tests/ui/components/Button.tsx b/tests/ui/components/Button.tsx
index 1a1b97fe18fc..0c0a1b5e2813 100644
--- a/tests/ui/components/Button.tsx
+++ b/tests/ui/components/Button.tsx
@@ -60,13 +60,14 @@ describe('Button Component', () => {
     });
 
     it('disables button when isDisabled is true', () => {
-        // Given the component is rendered with isDisabled true
-        renderButton({isDisabled: true});
+        // Given the component is rendered with isDisabled set to true
+        renderButton({isDisabled: true, onPress});
 
-        // Then the button is disabled
-        expect(getButton()).toHaveStyle({opacity: 0.5});
-        expect(getButton()).toHaveStyle({boxShadow: 'none'});
-        expect(getButton()).toHaveStyle({outlineStyle: 'none'});
+        // When the button is pressed
+        fireEvent.press(getButton());
+
+        // Then the onPress function should not be called
+        expect(onPress).not.toHaveBeenCalled();
     });
 
     it('sets accessibility label correctly', () => {
diff --git a/tests/unit/CalendarPickerTest.tsx b/tests/unit/CalendarPickerTest.tsx
index 3daee04f6ae9..5e6dbaf26ce0 100644
--- a/tests/unit/CalendarPickerTest.tsx
+++ b/tests/unit/CalendarPickerTest.tsx
@@ -133,8 +133,12 @@ describe('CalendarPicker', () => {
             />,
         );
 
-        // then the back arrow should be blocked
-        expect(screen.getByTestId('prev-month-arrow')).toHaveStyle({opacity: 0.5});
+        // When the previous month arrow is pressed
+        fireEvent.press(screen.getByTestId('prev-month-arrow'));
+
+        // Then the previous month should not be called as the previous month button is disabled
+        const prevMonth = subMonths(new Date(), 1).getMonth();
+        expect(screen.queryByText(monthNames.at(prevMonth) ?? '')).not.toBeOnTheScreen();
     });
 
     test('should block the next arrow when there is no available dates in the next month', () => {
@@ -147,7 +151,12 @@ describe('CalendarPicker', () => {
             />,
         );
 
-        expect(screen.getByTestId('next-month-arrow')).toHaveStyle({opacity: 0.5});
+        // When the next month arrow is pressed
+        fireEvent.press(screen.getByTestId('next-month-arrow'));
+
+        // Then the next month should not be called as the next month button is disabled
+        const nextMonth = addMonths(new Date(), 1).getMonth();
+        expect(screen.queryByText(monthNames.at(nextMonth) ?? '')).not.toBeOnTheScreen();
     });
 
     test('should allow navigating to the month of the max date when it has less days than the selected date', () => {
@@ -204,35 +213,55 @@ describe('CalendarPicker', () => {
     test('should not allow to press earlier day than minDate', () => {
         const value = '2003-02-17';
         const minDate = new Date('2003-02-16');
+        const onSelectedMock = jest.fn();
 
         // given the min date is 16
         render(
             <CalendarPicker
                 minDate={minDate}
                 value={value}
+                onSelected={onSelectedMock}
             />,
         );
 
-        // then the label 15 should not be clickable
-        expect(screen.getByLabelText('15')).toHaveStyle({boxShadow: 'none'});
-        expect(screen.getByLabelText('15')).toHaveStyle({outlineStyle: 'none'});
+        //  When the day 15 is pressed
+        fireEvent.press(screen.getByLabelText('15'));
+
+        // Then the onSelected should not be called as the label 15 is disabled
+        expect(onSelectedMock).not.toHaveBeenCalled();
+
+        // When the day 16 is pressed
+        fireEvent.press(screen.getByLabelText('16'));
+
+        // Then the onSelected should be called as the label 16 is enabled
+        expect(onSelectedMock).toHaveBeenCalledWith('2003-02-16');
     });
 
     test('should not allow to press later day than max', () => {
         const value = '2003-02-17';
         const maxDate = new Date('2003-02-24');
+        const onSelectedMock = jest.fn();
 
         // given the max date is 24
         render(
             <CalendarPicker
                 maxDate={maxDate}
                 value={value}
+                onSelected={onSelectedMock}
             />,
         );
 
-        // then the label 25 should not be clickable
-        expect(screen.getByLabelText('25')).toHaveStyle({boxShadow: 'none'});
-        expect(screen.getByLabelText('25')).toHaveStyle({outlineStyle: 'none'});
+        //  When the day 25 is pressed
+        fireEvent.press(screen.getByLabelText('25'));
+
+        // Then the onSelected should not be called as the label 15 is disabled
+        expect(onSelectedMock).not.toHaveBeenCalled();
+
+        // When the day 24 is pressed
+        fireEvent.press(screen.getByLabelText('24'));
+
+        // Then the onSelected should be called as the label 24 is enabled
+        expect(onSelectedMock).toHaveBeenCalledWith('2003-02-24');
     });
 
     test('should allow to press min date', () => {