diff --git a/core/lib/Drupal/Core/Render/theme.api.php b/core/lib/Drupal/Core/Render/theme.api.php
index 13ac3c0..3172b16 100644
--- a/core/lib/Drupal/Core/Render/theme.api.php
+++ b/core/lib/Drupal/Core/Render/theme.api.php
@@ -615,8 +615,6 @@ function hook_preprocess_HOOK(&$variables) {
  * hook called (in this case 'node__article') is available in
  * $variables['theme_hook_original'].
  *
- * @todo Add @code sample.
- *
  * @param array $variables
  *   An array of variables passed to the theme hook. Note that this hook is
  *   invoked before any preprocessing.
@@ -631,6 +629,10 @@ function hook_theme_suggestions_HOOK(array $variables) {
 
   $suggestions[] = 'node__' . $variables['elements']['#langcode'];
 
+  if ($node = \Drupal::routeMatch()->getParameter('node')) {
+    $suggestions[] = 'node__' . $node->id;
+  }
+
   return $suggestions;
 }