diff --git a/components/tvplanit/source/vpmonthview.pas b/components/tvplanit/source/vpmonthview.pas
index 8d1a7609f..59c2c4ae8 100644
--- a/components/tvplanit/source/vpmonthview.pas
+++ b/components/tvplanit/source/vpmonthview.pas
@@ -1558,7 +1558,7 @@ end;
 
 procedure TVpMonthView.MouseEnter;
 begin
-  FMouseDate := 0;
+  FMouseDate := -MaxInt;
 end;
 
 procedure TVpMonthView.MouseLeave;
diff --git a/components/tvplanit/source/vpmonthviewpainter.pas b/components/tvplanit/source/vpmonthviewpainter.pas
index 1963121ec..e92d1fe45 100644
--- a/components/tvplanit/source/vpmonthviewpainter.pas
+++ b/components/tvplanit/source/vpmonthviewpainter.pas
@@ -841,7 +841,7 @@ var
 begin
   inherited;
 
-  FDisplayDate := IfThen(RenderDate = 0, Date, RenderDate);
+  FDisplayDate := RenderDate;
 
   with TVpMonthViewOpener(FMonthView) do
   begin