diff --git a/core/modules/path/path.install b/core/modules/path/path.install
new file mode 100644
index 0000000..9bb3881
--- /dev/null
+++ b/core/modules/path/path.install
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the path module.
+ */
+
+/**
+ * Set all alias langcodes to default language on monolingual sites.
+ */
+function path_update_7000() {
+  if (!\Drupal::languageManager()->isMultilingual()) {
+    db_update('url_alias')
+      ->fields(array('langcode' => \Drupal::service('language.default')->get()->getId()))
+      ->execute();
+  }
+}
diff --git a/core/modules/path/src/Form/AddForm.php b/core/modules/path/src/Form/AddForm.php
index aab238b..5f3c86b 100644
--- a/core/modules/path/src/Form/AddForm.php
+++ b/core/modules/path/src/Form/AddForm.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\path\Form;
 
-use Drupal\Core\Language\LanguageInterface;
-
 /**
  * Provides the path add form.
  */
@@ -25,10 +23,11 @@ public function getFormId() {
    * {@inheritdoc}
    */
   protected function buildPath($pid) {
+    $language = \Drupal::service('language.default')->get();
     return array(
       'source' => '',
       'alias' => '',
-      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      'langcode' => $language->getId(),
       'pid' => NULL,
     );
   }
diff --git a/core/modules/path/src/Tests/PathAliasTest.php b/core/modules/path/src/Tests/PathAliasTest.php
index 7e85cda..38a1fee 100644
--- a/core/modules/path/src/Tests/PathAliasTest.php
+++ b/core/modules/path/src/Tests/PathAliasTest.php
@@ -24,13 +24,13 @@ class PathAliasTest extends PathTestBase {
    *
    * @var array
    */
-  public static $modules = array('path');
+  public static $modules = array('path', 'language');
 
   protected function setUp() {
     parent::setUp();
 
     // Create test user and login.
-    $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content', 'administer url aliases', 'create url aliases'));
+    $web_user = $this->drupalCreateUser(array('create page content', 'edit own page content', 'administer url aliases', 'create url aliases', 'administer site configuration', 'administer languages'));
     $this->drupalLogin($web_user);
   }
 
@@ -75,11 +75,41 @@ function testAdminAlias() {
     $node1 = $this->drupalCreateNode();
 
     // Create alias.
-    $edit = array();
-    $edit['source'] = '/node/' . $node1->id();
-    $edit['alias'] = '/' . $this->getRandomGenerator()->word(8);
+    $edit = array(
+      'source' => '/node/' . $node1->id(),
+      'alias' => '/' . $this->randomMachineName(8),
+    );
     $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
 
+    // Ensure the alias is set as default language English and the language
+    // column is shown. The language column will only show up if there is at
+    // least 1 alias with a language defined.
+    $this->drupalGet('admin/config/search/path');
+    $elements = $this->xpath("//a[text()='Language']");
+    $this->assertTrue(isset($elements[0]), 'The language column is available.');
+    $this->assertText('English', 'The new alias uses the default language.');
+    $this->drupalPostForm('admin/config/search/path/edit/' . $this->getPID($edit['alias']), array(), t('Delete'));
+    $this->drupalPostForm(NULL, array(), t('Confirm'));
+
+    // Change the site default language.
+    $language_name = $this->randomMachineName(16);
+    $edit = array(
+        'predefined_langcode' => 'custom',
+        'langcode' => 'xx',
+        'label' => $language_name,
+      );
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, 'Add custom language');
+    $this->config('system.site')->set('default_langcode', 'xx')->save();
+
+    // Create alias.
+    $edit = array(
+        'source' => '/node/' . $node1->id(),
+        'alias' => '/' . $this->randomMachineName(8),
+      );
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+    $this->drupalGet('admin/config/search/path');
+    $this->assertText($language_name, 'The new alias uses the default language.');
+
     // Confirm that the alias works.
     $this->drupalGet($edit['alias']);
     $this->assertText($node1->label(), 'Alias works.');