diff --git a/src/Form/SyncConfigureForm.php b/src/Form/SyncConfigureForm.php
index 8156a5b..633d8a7 100644
--- a/src/Form/SyncConfigureForm.php
+++ b/src/Form/SyncConfigureForm.php
@@ -95,7 +95,7 @@ class SyncConfigureForm extends FormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    global $config_directories;
+    global $config_directories, $install_state;
     $sync_directory = $form_state->getValue('sync_directory');
     if ($sync_directory != config_get_config_directory(CONFIG_SYNC_DIRECTORY)) {
       $settings['config_directories'][CONFIG_SYNC_DIRECTORY] = (object) array(
@@ -123,6 +123,10 @@ class SyncConfigureForm extends FormBase {
       }
       drupal_unlink($path);
     }
+    // Change the langcode to the site default langcode provided by the
+    // configuration.
+    $config_storage = new FileStorage(config_get_config_directory(CONFIG_SYNC_DIRECTORY));
+    $install_state['parameters']['langcode'] = $config_storage->read('system.site')['langcode'];
 
   }
 
diff --git a/src/Storage/SourceStorage.php b/src/Storage/SourceStorage.php
index e5353ef..936d129 100644
--- a/src/Storage/SourceStorage.php
+++ b/src/Storage/SourceStorage.php
@@ -117,8 +117,7 @@ class SourceStorage implements StorageInterface {
    * {@inheritdoc}
    */
   public function createCollection($collection) {
-    $this->baseStorage = $this->baseStorage->createCollection($collection);
-    return $this;
+    return new static($this->baseStorage->createCollection($collection), $this->profiles);
   }
 
   /**