diff --git a/lib/plugins/html/templates/url/index.pug b/lib/plugins/html/templates/url/index.pug
index 2687bc932..6bb02f321 100644
--- a/lib/plugins/html/templates/url/index.pug
+++ b/lib/plugins/html/templates/url/index.pug
@@ -86,7 +86,7 @@ block content
               td #{d.webpagetest.pageSummary.data.median.firstView.requestsFull}
 
       .one-half.column
-          if d.browsertime && d.browsertime.pageSummary && d.browsertime.pageSummary.screenshots
+          if d.browsertime && options.browsertime.screenshot && d.browsertime.pageSummary && d.browsertime.pageSummary.screenshots
             - var width = options.mobile ? 150 : '100%';
             a(href='data/screenshots/0.png')
               img.screenshot(src='data/screenshots/0.png', width=width, alt='Screenshot of run 1')
diff --git a/lib/plugins/html/templates/url/run.pug b/lib/plugins/html/templates/url/run.pug
index 85ec82d2a..b1c999ec2 100644
--- a/lib/plugins/html/templates/url/run.pug
+++ b/lib/plugins/html/templates/url/run.pug
@@ -90,7 +90,7 @@ block content
 
       .one-half.column
           //- No good way to detect if we have screenshots or not right now for a run
-          if d.browsertime
+          if d.browsertime && options.browsertime.screenshot
             - screenshotName = 'data/screenshots/' + runIndex + '.png'
             - var width = options.mobile ? 150 : '100%';
             a(href=screenshotName)