diff --git a/FSCalendar/FSCalendarCell.m b/FSCalendar/FSCalendarCell.m
index cd76f14..cd2c9a5 100644
--- a/FSCalendar/FSCalendarCell.m
+++ b/FSCalendar/FSCalendarCell.m
@@ -165,7 +165,8 @@
                 self.contentView.hidden = (currentLine>lineCount);
             }
         }
-    } else {
+    } else if (self.contentView.hidden) {
+        self.needsAdjustingViewFrame = YES;
         self.contentView.hidden = NO;
     }
     
@@ -436,7 +437,7 @@
 - (void)setSubtitle:(NSString *)subtitle
 {
     if (![_subtitle isEqualToString:subtitle]) {
-        _needsAdjustingViewFrame = !(_subtitle.length && subtitle.length);
+        _needsAdjustingViewFrame = (subtitle.length && !_subtitle.length) || (_subtitle.length && !subtitle.length);
         _subtitle = subtitle;
         if (_needsAdjustingViewFrame) {
             [self setNeedsLayout];