diff --git a/src/MaterialDesignThemes.Wpf/CustomPopupPlacementCallbackHelper.cs b/src/MaterialDesignThemes.Wpf/CustomPopupPlacementCallbackHelper.cs
deleted file mode 100644
index 58f3aafa59..0000000000
--- a/src/MaterialDesignThemes.Wpf/CustomPopupPlacementCallbackHelper.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace MaterialDesignThemes.Wpf;
-
-public static class CustomPopupPlacementCallbackHelper
-{
-    public static readonly CustomPopupPlacementCallback LargePopupCallback;
-
-    static CustomPopupPlacementCallbackHelper()
-    {
-        LargePopupCallback =
-            (size, targetSize, offset) => new[] { new CustomPopupPlacement(new Point(), PopupPrimaryAxis.Horizontal) };
-    }
-}
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
index cc84b241ad..b99dd3a267 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DatePicker.xaml
@@ -120,8 +120,7 @@
                     Template="{StaticResource CalendarButtonTemplate}" />
             <Popup x:Name="PART_Popup"
                    AllowsTransparency="True"
-                   CustomPopupPlacementCallback="{x:Static wpf:CustomPopupPlacementCallbackHelper.LargePopupCallback}"
-                   Placement="Custom"
+                   Placement="Bottom"
                    PlacementTarget="{Binding ElementName=PART_TextBox}"
                    PopupAnimation="Fade"
                    StaysOpen="False" />
diff --git a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml
index 28b5aa51bf..d33df3e72f 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.TimePicker.xaml
@@ -132,8 +132,7 @@
                     Template="{StaticResource ClockButtonTemplate}" />
             <Popup x:Name="PART_Popup"
                    AllowsTransparency="True"
-                   CustomPopupPlacementCallback="{x:Static wpf:CustomPopupPlacementCallbackHelper.LargePopupCallback}"
-                   Placement="Custom"
+                   Placement="Bottom"
                    PlacementTarget="{Binding ElementName=PART_TextBox}"
                    PopupAnimation="Fade"
                    StaysOpen="False" />
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
index 654642bda0..f7428f0489 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
@@ -333,6 +333,7 @@ public async Task DatePicker_ShouldApplyIsMouseOverTriggers_WhenHoveringCalendar
 
         recorder.Success();
     }
+
 }
 
 public class FutureDateValidationRule : ValidationRule