diff --git a/src/lambda/oembed/oembed.js b/src/lambda/oembed/oembed.js
index 6d195c64..3d244b23 100644
--- a/src/lambda/oembed/oembed.js
+++ b/src/lambda/oembed/oembed.js
@@ -35,7 +35,6 @@ function handler(event, context, callback) {
   }
 
   const { url, referrer, maxwidth = 900, maxheight = 300 } = params;
-  const iframeSrc = `${url.replace('gist', 'embed')}?panes=preview,result`;
 
   callback(null, {
     statusCode: 200,
@@ -48,7 +47,7 @@ function handler(event, context, callback) {
         provider_name: 'testing-playground.com',
         provider_url: host,
 
-        html: `<iframe src="${iframeSrc}" height="${maxheight}" width="${maxwidth}" scrolling="no" frameBorder="0" allowTransparency="true" title="Testing Playground" style="overflow: hidden; display: block; width: 100%"></iframe>`,
+        html: `<iframe src="${url}" height="${maxheight}" width="${maxwidth}" scrolling="no" frameBorder="0" allowTransparency="true" title="Testing Playground" style="overflow: hidden; display: block; width: 100%"></iframe>`,
         width: maxwidth,
         height: maxheight,
 
diff --git a/src/lambda/server/server.js b/src/lambda/server/server.js
index 73781177..bc8fd0cf 100644
--- a/src/lambda/server/server.js
+++ b/src/lambda/server/server.js
@@ -3,7 +3,12 @@ const path = require('path');
 const queryString = require('query-string');
 
 const filename = path.join(__dirname, './index.html');
-const indexHtml = fs.readFileSync(filename, 'utf8');
+const indexHtml = fs.existsSync(filename)
+  ? fs.readFileSync(filename, 'utf8')
+  : fs.readFileSync(
+      path.join(__dirname, '../../../dist/client/index.html'),
+      'utf8',
+    );
 
 function getHostname(event, context) {
   if (event.headers.host) {
@@ -19,7 +24,8 @@ function handler(event, context, callback) {
   const { panes, markup, query } = event.queryStringParameters;
   const host = getHostname(event, context);
 
-  const frameSrc = `${host}/embed?${queryString.stringify({
+  const embedPath = event.path.replace('/gist/', '/embed/');
+  const frameSrc = `${host}${embedPath}?${queryString.stringify({
     panes,
     markup,
     query,