diff --git a/UrlManager.php b/UrlManager.php
index d02a3ea..ab553bd 100644
--- a/UrlManager.php
+++ b/UrlManager.php
@@ -244,9 +244,10 @@ public function createUrl($params)
             $isLanguageGiven = isset($params[$this->languageParam]);
             $language = $isLanguageGiven ? $params[$this->languageParam] : Yii::$app->language;
             $isDefaultLanguage = $language === $this->getDefaultLanguage();
+            $isLinkRefersToBaseUrl = empty($params[0]);
 
-            if ($isLanguageGiven) {
-                unset($params[$this->languageParam]);
+            if (!$isLanguageGiven && !$isLinkRefersToBaseUrl) {
+                $params[$this->languageParam] = $language;
             }
 
             $url = parent::createUrl($params);