diff --git a/src/components/chart/Bars.jsx b/src/components/chart/Bars.jsx
index 0b0a7e0..4ccdf80 100644
--- a/src/components/chart/Bars.jsx
+++ b/src/components/chart/Bars.jsx
@@ -662,7 +662,7 @@ function Bars(props) {
           (isTaskCritical(task) ? ' wx-critical' : '');
         return (
           <Fragment key={task.id}>
-            {!task.$skip && (
+            {!task.$skip && Number.isFinite(task.$x) && (
               <div
                 className={'wx-GKbcLEGA ' + barClass}
                 style={taskStyle(task)}
@@ -749,7 +749,7 @@ function Bars(props) {
                   <Rollups key={i} rollup={rollup} parent={task} />
                 ))
               : null}
-            {baselinesValue && !task.$skip_baseline ? (
+            {baselinesValue && !task.$skip_baseline && Number.isFinite(task.$x_base) ? (
               <div
                 className={
                   'wx-GKbcLEGA wx-baseline' +