diff --git a/src/components/presentational/Timeline/DatetimeDot.js b/src/components/presentational/Timeline/DatetimeDot.js
index 1eff3e5..71c77c0 100644
--- a/src/components/presentational/Timeline/DatetimeDot.js
+++ b/src/components/presentational/Timeline/DatetimeDot.js
@@ -9,13 +9,16 @@ export default ({
   onSelect,
   styleProps,
   extraRender
-}) => (
-  <circle
-    onClick={onSelect}
-    className='event'
-    cx={x}
-    cy={y}
-    style={styleProps}
-    r={r}
-  />
-)
+}) => {
+  if (!y) return null
+  return (
+    <circle
+      onClick={onSelect}
+      className='event'
+      cx={x}
+      cy={y}
+      style={styleProps}
+      r={r}
+    />
+  )
+}
diff --git a/src/components/presentational/Timeline/Events.js b/src/components/presentational/Timeline/Events.js
index b9008c9..1159fec 100644
--- a/src/components/presentational/Timeline/Events.js
+++ b/src/components/presentational/Timeline/Events.js
@@ -91,6 +91,8 @@ const TimelineEvents = ({
         renderShape = renderDiamond
       } else if (event.shape === 'star') {
         renderShape = renderStar
+      } else {
+        renderShape = renderDot
       }
     }