diff --git a/frontend/app/player/MessageDistributor/MessageDistributor.ts b/frontend/app/player/MessageDistributor/MessageDistributor.ts
index fefd703fd..7d4ed9f33 100644
--- a/frontend/app/player/MessageDistributor/MessageDistributor.ts
+++ b/frontend/app/player/MessageDistributor/MessageDistributor.ts
@@ -526,6 +526,7 @@ export default class MessageDistributor extends StatedScreen {
             this.performanceTrackManager.setCurrentNodesCount(this.windowNodeCounter.count);
             break;
         }
+        this.performanceTrackManager.addNodeCountPointIfNeed(msg.time)
         this.pagesManager.appendMessage(msg);
         break;
     }
diff --git a/frontend/app/player/MessageDistributor/managers/PerformanceTrackManager.ts b/frontend/app/player/MessageDistributor/managers/PerformanceTrackManager.ts
index 9c036c0d2..c4a4a8e63 100644
--- a/frontend/app/player/MessageDistributor/managers/PerformanceTrackManager.ts
+++ b/frontend/app/player/MessageDistributor/managers/PerformanceTrackManager.ts
@@ -65,11 +65,34 @@ export default class PerformanceTrackManager extends ListWalker<PerformanceTrack
 		super.append(msg);
 	}
 
+
+	// TODO: refactor me
+	private prevNCTime = 0
+	addNodeCountPointIfNeed(time: number) {
+		if ((this.prevTime && time - this.prevTime < 200) || (time - this.prevNCTime < 200)) {
+			return
+		}
+		const lastPoint = this.chart[this.chart.length - 1]
+		if (lastPoint && lastPoint.nodesCount === this.prevNodesCount) {
+			return
+		}
+		const newPoint = Object.assign({
+			usedHeap:0,
+			totalHeap: 0,
+			fps: null,
+			cpu: null,
+		}, lastPoint)
+		newPoint.time = time
+		newPoint.nodesCount = this.prevNodesCount
+		this.chart.push(newPoint)
+		this.prevNCTime = time
+	}
+
 	setCurrentNodesCount(count: number) {
 		this.prevNodesCount = count;
-		if (this.chart.length > 0) {
-			this.chart[ this.chart.length - 1 ].nodesCount = count;
-		}
+		// if (this.chart.length > 0) {
+		// 	this.chart[ this.chart.length - 1 ].nodesCount = count;
+		// }
 	} 
 
 	handleVisibility(msg: SetPageVisibility):void {