diff --git a/app/javascript/flavours/glitch/entrypoints/embed.tsx b/app/javascript/flavours/glitch/entrypoints/embed.tsx
index 12eb4a413f..2249aa9e69 100644
--- a/app/javascript/flavours/glitch/entrypoints/embed.tsx
+++ b/app/javascript/flavours/glitch/entrypoints/embed.tsx
@@ -60,6 +60,10 @@ window.addEventListener('message', (e) => {
 
   const data = e.data;
 
+  // Only set overflow to `hidden` once we got the expected `message` so the post can still be scrolled if
+  // embedded without parent Javascript support
+  document.body.style.overflow = 'hidden';
+
   // We use a timeout to allow for the React page to render before calculating the height
   afterInitialRender(() => {
     window.parent.postMessage(
diff --git a/app/javascript/flavours/glitch/styles/basics.scss b/app/javascript/flavours/glitch/styles/basics.scss
index 2ecc855b9c..e50319ab19 100644
--- a/app/javascript/flavours/glitch/styles/basics.scss
+++ b/app/javascript/flavours/glitch/styles/basics.scss
@@ -107,13 +107,7 @@ body {
   &.embed {
     margin: 0;
     padding-bottom: 0;
-
-    .container {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      overflow: hidden;
-    }
+    overflow: hidden;
   }
 
   &.admin {