diff --git a/components/callite/source/calendarlite.pas b/components/callite/source/calendarlite.pas
index 25efbcfe4..dabeb1627 100644
--- a/components/callite/source/calendarlite.pas
+++ b/components/callite/source/calendarlite.pas
@@ -790,6 +790,9 @@ var
   dx, dy, ox, oy, halfx, halfy: integer;
   pts: TArrowPoints;
 begin
+  if (coNoMonthChange in FOwner.Options) then
+    exit;
+
   FCanvas.Pen.Style := psSolid;
   if (FCanvas.Brush.Color <> FOwner.Colors.ArrowColor) then
     FCanvas.Brush.Color:= FOwner.Colors.ArrowColor;
@@ -1370,6 +1373,7 @@ begin
         2: if not (coNoMonthChange in FOwner.Options) then
              FOwner.Date := IncMonth(FOwner.Date, -1);
         3..5:
+          if not (coNoMonthChange in FOwner.Options) then
           begin
             GetMonthYearRects(Rm{%H-}, Ry{%H-});
             if PtInRect(Rm, APoint) then begin
@@ -2197,6 +2201,7 @@ begin
   end;
   if High(FCalDrawer.FRowPositions) <> FCalDrawer.FLastRow then
     SetLength(FCalDrawer.FRowPositions, FCalDrawer.FLastRow+1);
+  if (coNoMonthChange in FOptions) then;
   Draw;
 end;