diff --git a/beta/src/components/MDX/CodeBlock/CodeBlock.tsx b/beta/src/components/MDX/CodeBlock/CodeBlock.tsx
index 0b44734a..b7894e53 100644
--- a/beta/src/components/MDX/CodeBlock/CodeBlock.tsx
+++ b/beta/src/components/MDX/CodeBlock/CodeBlock.tsx
@@ -146,7 +146,7 @@ const CodeBlock = function CodeBlock({
       finalOutput.push(
         <div
           key={lineIndex}
-          className={'cm-line ' + highlightedLines.get(lineIndex)}>
+          className={'cm-line ' + (highlightedLines.get(lineIndex) ?? '')}>
           {lineOutput}
           <br />
         </div>
@@ -161,7 +161,7 @@ const CodeBlock = function CodeBlock({
   finalOutput.push(
     <div
       key={lineIndex}
-      className={'cm-line ' + highlightedLines.get(lineIndex)}>
+      className={'cm-line ' + (highlightedLines.get(lineIndex) ?? '')}>
       {lineOutput}
     </div>
   );
@@ -177,8 +177,8 @@ const CodeBlock = function CodeBlock({
       <div className="sp-wrapper sp-121717251 sp-c-fVPbOs sp-c-fVPbOs-LrWkf-variant-dark">
         <div className="sp-stack sp-c-kLppIp">
           <div className="sp-code-editor sp-c-bNbSGz">
-            <pre className="sp-cm sp-pristine sp-javascript sp-c-jcgexo sp-c-jkvvao">
-              <code className="sp-pre-placeholder sp-c-fWymNx">
+            <pre className="sp-cm sp-pristine sp-javascript sp-c-jcgexo sp-c-jkvvao flex align-start">
+              <code className="sp-pre-placeholder sp-c-fWymNx grow-[2]">
                 {finalOutput}
               </code>
             </pre>
diff --git a/beta/src/styles/sandpack.css b/beta/src/styles/sandpack.css
index e1ca99e3..fba8c6f7 100644
--- a/beta/src/styles/sandpack.css
+++ b/beta/src/styles/sandpack.css
@@ -230,6 +230,7 @@ html.dark .sandpack--playground .sp-overlay {
 .sandpack--codeblock .cm-line {
   margin-left: -20px;
   padding-left: 20px;
+  padding-right: 20px;
 }
 
 /**