diff --git a/app/models/communication/website/menu.rb b/app/models/communication/website/menu.rb
index 6317937ec4d8593d097573a82732e5d97cae157c..4b5ca387c263515803d524dc97ee219ca8ebbffe 100644
--- a/app/models/communication/website/menu.rb
+++ b/app/models/communication/website/menu.rb
@@ -41,7 +41,7 @@ class Communication::Website::Menu < ApplicationRecord
   def git_path(website)
     # TODO I18n : Right now, we use the language of the website. Add a language to the menu (and future translations)
     path = "data/menus/"
-    path += "#{website.languages.first.iso_code}/" if website.languages.any?
+    path += "#{website.default_language.iso_code}/" if website.languages.any?
     "#{path}#{identifier}.yml"
   end
 
diff --git a/app/models/communication/website/page/with_path.rb b/app/models/communication/website/page/with_path.rb
index 1809109d1bc8d8792cd5d9557502e08f6e7a92f5..0b860794eba63e132b76e505ff58cad7f25a6b1f 100644
--- a/app/models/communication/website/page/with_path.rb
+++ b/app/models/communication/website/page/with_path.rb
@@ -20,9 +20,9 @@ module Communication::Website::Page::WithPath
     path = ''
     # TODO i18n remplacer le choix de la langue
     if website.languages.many?
-      path += "/fr" 
+      path += "/fr"
     elsif website.languages.any?
-      path += "/#{website.languages.first.iso_code}"
+      path += "/#{website.default_language.iso_code}"
     end
     path += "/#{slug_with_ancestors}/"
     path.gsub(/\/+/, '/')
diff --git a/app/models/communication/website/permalink.rb b/app/models/communication/website/permalink.rb
index d3bcc73b5f93628c3926667c9ad13d7f4fa0a881..69223ec0430eae2c357acfb666d66427ac8d0d0e 100644
--- a/app/models/communication/website/permalink.rb
+++ b/app/models/communication/website/permalink.rb
@@ -107,7 +107,7 @@ class Communication::Website::Permalink < ApplicationRecord
   def published_path
     # TODO I18n doit prendre la langue du about
     p = ""
-    p += "/#{website.languages.first.iso_code}" if website.languages.any?
+    p += "/#{website.default_language.iso_code}" if website.languages.any?
     p += pattern
     substitutions.each do |key, value|
       p.gsub! ":#{key}", "#{value}"
diff --git a/app/models/concerns/with_git.rb b/app/models/concerns/with_git.rb
index be5ea940bc46dcb46b7688c92765ac6bf721c401..02eea67031e4a97b6c94fc052152449337019203 100644
--- a/app/models/concerns/with_git.rb
+++ b/app/models/concerns/with_git.rb
@@ -20,7 +20,7 @@ module WithGit
       # todo totalement arbitraire
       path += "fr/"
     elsif website.languages.any?
-      path += "#{website.languages.first.iso_code}/"
+      path += "#{website.default_language.iso_code}/"
     end
     path
   end
diff --git a/app/views/admin/communication/websites/configs/development_config/static.html.erb b/app/views/admin/communication/websites/configs/development_config/static.html.erb
index 68dc1a1124814beb5afeb6f33497ec6d07a4420b..378d0a376afa1afbbaeb83a2c232f64e8de6bfce 100644
--- a/app/views/admin/communication/websites/configs/development_config/static.html.erb
+++ b/app/views/admin/communication/websites/configs/development_config/static.html.erb
@@ -1,5 +1,5 @@
 # DO NOT EDIT THIS FILE BY HAND - IT WILL BE OVERWRITTEN BY OSUNY
 
 <%# TODO I18n: Add "Default language" in Communication::Website %>
-defaultContentLanguage: <%= @website.languages.first.iso_code %>
+defaultContentLanguage: <%= @website.default_language.iso_code %>
 defaultContentLanguageInSubdir: <%= @website.languages.many? %>
\ No newline at end of file
diff --git a/app/views/admin/communication/websites/configs/production_config/static.html.erb b/app/views/admin/communication/websites/configs/production_config/static.html.erb
index 30b86e4b22ae529b7bb6386415eff4684bb02241..b826bccd0e8e91a55012031975c20606fef52f86 100644
--- a/app/views/admin/communication/websites/configs/production_config/static.html.erb
+++ b/app/views/admin/communication/websites/configs/production_config/static.html.erb
@@ -3,10 +3,7 @@
 baseURL: <%= @website.url %>
 
 ## LANGUAGE
-<%# TODO I18n: Add "Default language" in Communication::Website %>
-<% if @website.languages.many? %>
-defaultContentLanguage: fr
-<% else %>
-defaultContentLanguage: <%= @website.languages.first.iso_code %>
+<% if @website.languages.any? %>
+defaultContentLanguage: <%= @website.default_language.iso_code %>
 <% end %>
 defaultContentLanguageInSubdir: <%= @website.languages.many? %>