diff --git a/src/components/scatterplot/scatterplot.js b/src/components/scatterplot/scatterplot.js
index 55102be2..a8b862a2 100644
--- a/src/components/scatterplot/scatterplot.js
+++ b/src/components/scatterplot/scatterplot.js
@@ -100,6 +100,7 @@ class Scatterplot extends React.Component {
   maybeSetupScalesAndDrawAxes(nextProps) {
     if (
       nextProps.expression &&
+      nextProps.expression.data &&
       nextProps.scatterplotXXaccessor &&
       nextProps.scatterplotYYaccessor
     ) {