diff --git a/core/modules/system/lib/Drupal/system/Controller/SystemController.php b/core/modules/system/lib/Drupal/system/Controller/SystemController.php
index 361f716..d568df5 100644
--- a/core/modules/system/lib/Drupal/system/Controller/SystemController.php
+++ b/core/modules/system/lib/Drupal/system/Controller/SystemController.php
@@ -212,13 +212,18 @@ public function themesPage() {
       }
       // Look for a screenshot in the current theme or in its closest ancestor.
       foreach (array_reverse($theme_keys) as $theme_key) {
-        if (isset($themes[$theme_key]) && file_exists($themes[$theme_key]->info['screenshot'])) {
+        if (isset($themes[$theme_key])) {
           $theme->screenshot = array(
-            'uri' => $themes[$theme_key]->info['screenshot'],
             'alt' => $this->t('Screenshot for !theme theme', array('!theme' => $theme->info['name'])),
             'title' => $this->t('Screenshot for !theme theme', array('!theme' => $theme->info['name'])),
             'attributes' => array('class' => array('screenshot')),
           );
+          if (file_exists($themes[$theme_key]->info['screenshot'])) {
+            $theme->screenshot['uri'] = $themes[$theme_key]->info['screenshot'];
+          }
+          else {
+            $theme->screenshot['uri'] = 'core/misc/no_screenshot.png';
+          }
           break;
         }
       }
diff --git a/core/modules/system/templates/system-themes-page.html.twig b/core/modules/system/templates/system-themes-page.html.twig
index 80089fd..fa0e748 100644
--- a/core/modules/system/templates/system-themes-page.html.twig
+++ b/core/modules/system/templates/system-themes-page.html.twig
@@ -34,10 +34,6 @@
         <div{{ theme.attributes }}>
           {% if theme.screenshot %}
             {{ theme.screenshot }}
-          {% else %}
-            <div class="no-screenshot">
-              <div class="no-screenshot__text">{{ "no screenshot"|t }}</div>
-            </div>
           {% endif %}
           <div class="theme-info">
             <h3>