diff --git a/package/recalbox-system/odroidxu4/recalbox.conf b/package/recalbox-system/odroidxu4/recalbox.conf
index 930fc52828ba663676db0c50658413d37c3ae1f7..433712ee406728f3320b59200d8ea015efe574d2 100644
--- a/package/recalbox-system/odroidxu4/recalbox.conf
+++ b/package/recalbox-system/odroidxu4/recalbox.conf
@@ -127,7 +127,7 @@ emulationstation.forcebasicgamelistview=0
 system.emulators.specialkeys=default
 
 ## Show or hide kodi in emulationstation (0,1)
-kodi.enabled=1
+kodi.enabled=0
 ## Start kodi at launch (0,1)
 kodi.atstartup=0
 ## set x button shortcut (0,1)
diff --git a/package/recalbox-system/rpi1/recalbox.conf b/package/recalbox-system/rpi1/recalbox.conf
index 155b67cc254fd184704e4ede0122477567d3eff1..52b6a2e52ebe06909a618a823239f1e3b7851db4 100644
--- a/package/recalbox-system/rpi1/recalbox.conf
+++ b/package/recalbox-system/rpi1/recalbox.conf
@@ -136,7 +136,7 @@ emulationstation.forcebasicgamelistview=0
 system.emulators.specialkeys=default
 
 ## Show or hide kodi in emulationstation (0,1)
-kodi.enabled=1
+kodi.enabled=0
 ## Start kodi at launch (0,1)
 kodi.atstartup=0
 ## set x button shortcut (0,1)
diff --git a/package/recalbox-system/rpi3/recalbox.conf b/package/recalbox-system/rpi3/recalbox.conf
index 4556281877426f8a4d440fdbb76ef8df5c7efd98..a06277f4cbca3d2c4ba7dfccaf534860c60467c1 100644
--- a/package/recalbox-system/rpi3/recalbox.conf
+++ b/package/recalbox-system/rpi3/recalbox.conf
@@ -136,7 +136,7 @@ emulationstation.forcebasicgamelistview=0
 system.emulators.specialkeys=default
 
 ## Show or hide kodi in emulationstation (0,1)
-kodi.enabled=1
+kodi.enabled=0
 ## Start kodi at launch (0,1)
 kodi.atstartup=0
 ## set x button shortcut (0,1)
diff --git a/package/recalbox-system/rpi4/recalbox.conf b/package/recalbox-system/rpi4/recalbox.conf
index fabe2bd1a5e73beb48eb0ce20c025486f0d4c7a2..10f79b1420390993bfab3443d657038dbc070388 100644
--- a/package/recalbox-system/rpi4/recalbox.conf
+++ b/package/recalbox-system/rpi4/recalbox.conf
@@ -128,7 +128,7 @@ emulationstation.forcebasicgamelistview=0
 system.emulators.specialkeys=default
 
 ## Show or hide kodi in emulationstation (0,1)
-kodi.enabled=1
+kodi.enabled=0
 ## Start kodi at launch (0,1)
 kodi.atstartup=0
 ## set x button shortcut (0,1)
diff --git a/package/recalbox-system/rpi4_64/recalbox.conf b/package/recalbox-system/rpi4_64/recalbox.conf
index f57bed92017d227620da5c346148f21528d52175..213bf21286cc2729ad84a489e207e7c82b26b72f 100644
--- a/package/recalbox-system/rpi4_64/recalbox.conf
+++ b/package/recalbox-system/rpi4_64/recalbox.conf
@@ -128,7 +128,7 @@ emulationstation.forcebasicgamelistview=0
 system.emulators.specialkeys=default
 
 ## Show or hide kodi in emulationstation (0,1)
-kodi.enabled=1
+kodi.enabled=0
 ## Start kodi at launch (0,1)
 kodi.atstartup=0
 ## set x button shortcut (0,1)
diff --git a/package/recalbox-system/rpi5_64/recalbox.conf b/package/recalbox-system/rpi5_64/recalbox.conf
index c35c2c4beb3ecd109f3ca9ad6f7afd54547a9817..c0de4de65ae5380b7a1506bac8abf3ce905423ba 100644
--- a/package/recalbox-system/rpi5_64/recalbox.conf
+++ b/package/recalbox-system/rpi5_64/recalbox.conf
@@ -128,7 +128,7 @@ emulationstation.forcebasicgamelistview=0
 system.emulators.specialkeys=default
 
 ## Show or hide kodi in emulationstation (0,1)
-kodi.enabled=1
+kodi.enabled=0
 ## Start kodi at launch (0,1)
 kodi.atstartup=0
 ## set x button shortcut (0,1)
diff --git a/package/recalbox-system/rpizero2/recalbox.conf b/package/recalbox-system/rpizero2/recalbox.conf
index c0073426efa3a7b53004863d1e5c719b1e444ec4..1aecb5b7aaca1e3228e5db273fbaf08551072cc6 100644
--- a/package/recalbox-system/rpizero2/recalbox.conf
+++ b/package/recalbox-system/rpizero2/recalbox.conf
@@ -136,7 +136,7 @@ emulationstation.forcebasicgamelistview=0
 system.emulators.specialkeys=default
 
 ## Show or hide kodi in emulationstation (0,1)
-kodi.enabled=1
+kodi.enabled=0
 ## Start kodi at launch (0,1)
 kodi.atstartup=0
 ## set x button shortcut (0,1)
diff --git a/package/recalbox-system/rpizero2legacy/recalbox.conf b/package/recalbox-system/rpizero2legacy/recalbox.conf
index 9fa5a81a6355d878b66fd85e80908c90445f4c2d..1b34fee6de842bd08b1c7ee7d8986416fc6de597 100644
--- a/package/recalbox-system/rpizero2legacy/recalbox.conf
+++ b/package/recalbox-system/rpizero2legacy/recalbox.conf
@@ -136,7 +136,7 @@ emulationstation.forcebasicgamelistview=0
 system.emulators.specialkeys=default
 
 ## Show or hide kodi in emulationstation (0,1)
-kodi.enabled=1
+kodi.enabled=0
 ## Start kodi at launch (0,1)
 kodi.atstartup=0
 ## set x button shortcut (0,1)
diff --git a/package/recalbox-system/x86_64/recalbox.conf b/package/recalbox-system/x86_64/recalbox.conf
index 3eb5b8bb19e452187c96f863325f50b61d29527e..58c841fbf33ad9dca0a193d4d66783807babdf06 100644
--- a/package/recalbox-system/x86_64/recalbox.conf
+++ b/package/recalbox-system/x86_64/recalbox.conf
@@ -126,7 +126,7 @@ emulationstation.forcebasicgamelistview=0
 system.emulators.specialkeys=default
 
 ## Show or hide kodi in emulationstation (0,1)
-kodi.enabled=1
+kodi.enabled=0
 ## Start kodi at launch (0,1)
 kodi.atstartup=0
 ## set x button shortcut (0,1)
diff --git a/projects/frontend/es-app/src/guis/menus/GuiMenu.cpp b/projects/frontend/es-app/src/guis/menus/GuiMenu.cpp
index 21714d4134f5a6ea6b65a0c377e7b716945ade76..62390deeaa9209a2c11e482532bbbdc06afe8185 100755
--- a/projects/frontend/es-app/src/guis/menus/GuiMenu.cpp
+++ b/projects/frontend/es-app/src/guis/menus/GuiMenu.cpp
@@ -30,10 +30,6 @@ GuiMenu::GuiMenu(WindowManager& window, SystemManager& systemManager, const IGlo
   // Bartop mode?
   bool bartop = RecalboxConf::Instance().GetMenuType() == RecalboxConf::Menu::Bartop;
 
-  // Kodi
-  if (RecalboxSystem::kodiExists() && RecalboxConf::Instance().GetKodiEnabled())
-    AddSubMenu(_("KODI MEDIA CENTER"), MenuThemeData::MenuIcons::Type::Kodi, (int)Components::Kodi, _(MENUMESSAGE_START_KODI_HELP_MSG));
-
   // System menu
   if (!bartop)
     AddSubMenu(_("SYSTEM SETTINGS"), MenuThemeData::MenuIcons::Type::System, (int)Components::System, _(MENUMESSAGE_SYSTEM_HELP_MSG));
diff --git a/projects/frontend/es-app/src/systems/SystemManager.cpp b/projects/frontend/es-app/src/systems/SystemManager.cpp
index 5463dc264bfec4decfc8872a15faad7d2e690a65..9a558ecb262318a5273e3f51ab5b510b791b4e81 100644
--- a/projects/frontend/es-app/src/systems/SystemManager.cpp
+++ b/projects/frontend/es-app/src/systems/SystemManager.cpp
@@ -768,6 +768,20 @@ SystemData* SystemManager::CreateArcadeSystem()
   return result;
 }
 
+if (RecalboxSystem::kodiExists() && RecalboxConf::Instance().GetKodiEnabled())
+{
+  SystemData* SystemManager::CreateKodiSystem()
+  {
+    SystemDescriptor descriptor;
+    descriptor.SetSystemInformation("bf126aeb-416a-471d-a868-b417f5e04ef8", sKodiSystemShortName, sKodiSystemFullName)
+              .SetPropertiesInformation("other", "no", "no", "no", "2020-01-01", "None", false, false, false, "")
+              .SetDescriptorInformation("", "", sKodiSystemShortName, "", "", false, false, false);
+    SystemData* result = new SystemData(*this, descriptor, SystemData::Properties::Virtual | SystemData::Properties::Searchable,
+                                        MetadataType::None, VirtualSystemType::Ports);
+    return result;
+  }
+}
+
 SystemData* SystemManager::CreateGenreSystem(GameGenres genre)
 {
   SystemDescriptor descriptor;
diff --git a/projects/frontend/es-app/src/systems/SystemManager.h b/projects/frontend/es-app/src/systems/SystemManager.h
index 18b1c3d05e08926442c7c6398673bbfa7223b925..65259de94c774a9f0cc8539d8c26d6da0f1a1289 100644
--- a/projects/frontend/es-app/src/systems/SystemManager.h
+++ b/projects/frontend/es-app/src/systems/SystemManager.h
@@ -55,6 +55,8 @@ class SystemManager : private INoCopy // No copy allowed
     static constexpr const char* sLightgunSystemShortName = "lightgun";
     //! Ports system internal name
     static constexpr const char* sArcadeSystemShortName = "arcade";
+    //! Kodi system internal name
+    static constexpr const char* sKodiSystemShortName = "kodi";
 
     //! Multiplayer system user-friendly name
     static constexpr const char* sMultiplayerSystemFullName = "Multi Players";
@@ -70,6 +72,8 @@ class SystemManager : private INoCopy // No copy allowed
     static constexpr const char* sLightgunSystemFullName = "LightGun Games";
     //! Ports system internal name
     static constexpr const char* sArcadeSystemFullName = "Arcade";
+    //! Kodi system internal name
+    static constexpr const char* sKodiSystemFullName = "Kodi";
 
   private:
     //! Rom source folder to read/write (false) / read-only (true) state