diff --git a/src/app.ts b/src/app.ts
index dd5247b..aec106b 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -16,9 +16,6 @@ async function main() {
   const env = Object.assign({}, process.env);
   const command = argv._[0];
 
-  // See https://github.com/grafana/grafana-image-renderer/issues/460
-  process.env["PUPPETEER_DISABLE_HEADLESS_WARNING"] = "true"
-
   if (command === undefined) {
     const logger = new PluginLogger();
     const config: PluginConfig = defaultPluginConfig;
diff --git a/src/browser/browser.ts b/src/browser/browser.ts
index 3f93d54..530ecac 100644
--- a/src/browser/browser.ts
+++ b/src/browser/browser.ts
@@ -137,7 +137,7 @@ export class Browser {
       launcherOptions.executablePath = this.config.chromeBin;
     }
 
-    launcherOptions.headless = !this.config.headed;
+    launcherOptions.headless = !this.config.headed ? "shell" : false;
 
     return launcherOptions;
   }