diff --git a/src/heatmap/index.tsx b/src/heatmap/index.tsx
index 4879eb5..62185f2 100644
--- a/src/heatmap/index.tsx
+++ b/src/heatmap/index.tsx
@@ -274,33 +274,6 @@ class CalendarHeatmap extends React.Component {
         );
     }
 
-    renderAllWeeks() {
-        return getRange(this.getWeekCount()).map((weekIndex) => this.renderWeek(weekIndex));
-    }
-
-    renderMonthLabels() {
-        if (!this.props.showMonthLabels) {
-            return null;
-        }
-
-        const adapter = (date) => {
-            const [x, y] = this.getMonthLabelCoordinates(dFns.differenceInWeeks(date, this.props.startDate));
-            return {
-                x,
-                y
-            }
-        };
-
-        return <>
-            <MonthLabels
-                startDate={this.props.startDate}
-                endDate={this.props.endDate}
-                getMonthLabelCoordinates={adapter}
-            />
-            {/*{...a}*/}
-        </>
-    }
-
     renderWeekdayLabels() {
         if (!this.props.showWeekdayLabels) {
             return null;
@@ -322,19 +295,36 @@ class CalendarHeatmap extends React.Component {
     render() {
         this.valueCache = this.getValueCache(this.props);
 
+        const monthPositionAdapter = (date) => {
+            const [x, y] = this.getMonthLabelCoordinates(dFns.differenceInWeeks(date, this.props.startDate));
+            return {
+                x,
+                y
+            }
+        };
+
+        const weeks = dFns.eachWeekOfInterval({
+            start: this.props.startDate,
+            end: this.props.endDate,
+        });
+
         return (
             <svg className="react-calendar-heatmap" viewBox={this.getViewBox()}>
                 <g
                     transform={this.getTransformForMonthLabels()}
                     className={`${CSS_PSEDUO_NAMESPACE}month-labels`}
                 >
-                    {this.renderMonthLabels()}
+                    {this.props.showMonthLabels && <MonthLabels
+                        startDate={this.props.startDate}
+                        endDate={this.props.endDate}
+                        getMonthLabelCoordinates={monthPositionAdapter}
+                    />}
                 </g>
                 <g
                     transform={this.getTransformForAllWeeks()}
                     className={`${CSS_PSEDUO_NAMESPACE}all-weeks`}
                 >
-                    {this.renderAllWeeks()}
+                    {weeks.map((_, index) => this.renderWeek(index))}
                 </g>
                 <g
                     transform={this.getTransformForWeekdayLabels()}