diff --git a/web/package.json b/web/package.json
index 65c50e9..4b2a913 100644
--- a/web/package.json
+++ b/web/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "build": "cross-env GATSBY_EXPERIMENTAL_PAGE_BUILD_ON_DATA_CHANGES=true gatsby build --log-pages",
     "deploy": "npm run now-deploy",
-    "develop": "gatsby develop",
+    "develop": "mkdir -p .cache && gatsby develop",
     "empty-cache": "gatsby clean",
     "lint": "eslint .",
     "now-build": "npm run build",
diff --git a/web/src/components/block-content/iframe.js b/web/src/components/block-content/iframe.js
index a2ca154..409fb07 100644
--- a/web/src/components/block-content/iframe.js
+++ b/web/src/components/block-content/iframe.js
@@ -1,19 +1,18 @@
 /** @jsx jsx */
 import { jsx, Text } from "theme-ui";
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 
 function IFrame(props) {
   const iframeRef = useRef(null);
 
-  const ratioValues = props.aspectRatio ? props.aspectRatio.split(":") : ["16", "9"];
-  const aspectRatio = `${((ratioValues[1] * 100) / ratioValues[0]).toFixed(2)}%`;
-
   const chartId = props.url?.includes("datawrapper.dwcdn.net")
     ? props.url.match(/dwcdn\.net\/([a-zA-Z0-9]+)\//)?.[1]
     : null;
 
+  const [dwHeight, setDwHeight] = useState(400);
+
   useEffect(() => {
-    if (!props.url || !chartId) return;
+    if (!chartId) return;
 
     const scriptId = `dw-script-${chartId}`;
     if (!document.getElementById(scriptId)) {
@@ -23,29 +22,57 @@ function IFrame(props) {
       script.id = scriptId;
       document.body.appendChild(script);
     }
+
+    function onMessage(event) {
+      if (event.data?.["datawrapper-height"]?.[chartId]) {
+        setDwHeight(event.data["datawrapper-height"][chartId]);
+      }
+    }
+    window.addEventListener("message", onMessage);
+    return () => window.removeEventListener("message", onMessage);
   }, [props.url, chartId]);
 
+  const ratioValues = props.aspectRatio ? props.aspectRatio.split(":") : ["16", "9"];
+  const aspectRatio = `${((ratioValues[1] * 100) / ratioValues[0]).toFixed(2)}%`;
+
   return (
     <div style={{ alignItems: "center" }}>
       <br />
-      <div style={{ paddingBottom: aspectRatio, position: "relative" }}>
-        {props.url && (
-          <iframe
-            ref={iframeRef}
-            src={props.url}
-            id={chartId ? `datawrapper-chart-${chartId}` : undefined}
-            title={props.caption || "Embedded content"}
-            scrolling="no"
-            style={{
-              height: "100%",
-              width: "100%",
-              position: "absolute",
-              border: "none",
-            }}
-            data-external="1"
-          />
-        )}
-      </div>
+      {chartId ? (
+        <iframe
+          ref={iframeRef}
+          src={props.url}
+          id={`datawrapper-chart-${chartId}`}
+          title={props.caption || "Embedded content"}
+          scrolling="no"
+          style={{
+            width: "0",
+            minWidth: "100%",
+            height: `${dwHeight}px`,
+            border: "none",
+            display: "block",
+          }}
+          data-external="1"
+        />
+      ) : (
+        <div style={{ paddingBottom: aspectRatio, position: "relative" }}>
+          {props.url && (
+            <iframe
+              ref={iframeRef}
+              src={props.url}
+              title={props.caption || "Embedded content"}
+              scrolling="no"
+              style={{
+                height: "100%",
+                width: "100%",
+                position: "absolute",
+                border: "none",
+              }}
+              data-external="1"
+            />
+          )}
+        </div>
+      )}
       <Text variant="caption">{props.caption}</Text>
       <br />
     </div>