diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 381fbd4..b338e47 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -13,6 +13,8 @@
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrlFallback;
 use Drupal\node\NodeTypeInterface;
+use Drupal\block\BlockInterface;
+
 
 /**
  * Implements hook_help().
@@ -535,3 +537,28 @@ function language_field_info_alter(&$info) {
   // Change the default behavior of language field.
   $info['language']['class'] = '\Drupal\language\DefaultLanguageItem';
 }
+
+
+/**
+ * Implements hook_ENTITY_TYPE_insert().
+ */
+function language_block_insert($entity) {
+  language_block_update($entity);
+}
+
+
+/**
+ * Implements hook_ENTITY_TYPE_update().
+ */
+function language_block_update($entity) {
+  // If the language switcher block has been enabled, check to see whether
+  // any languages have been added (if they haven't it won't work)
+  if ($entity->id() == 'languageswitcher' && $entity->get('region') != BlockInterface::BLOCK_REGION_NONE) {
+    $language_list = Drupal::languageManager()->getLanguages();
+    if (count($language_list) <= 1) {
+      $message = t('With the language switcher block you can switch the languages of the interface, to do this you will need to add a language on the <a href="@language_admin">language administration page</a>',
+        array('@language_admin' => '/admin/config/regional/language'));
+      drupal_set_message($message);
+    }
+  }
+}
\ No newline at end of file