diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 99b86c575..93a661dde 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -83,7 +83,6 @@ namespace PlatformIds
         "megadrive",            // Sega Mega Drive
         "megaduck",             // Creatronic Mega Duck
         "mess",                 // Multi Emulator Super System
-        "moonlight",            // Moonlight game streaming
         "moto",                 // Thomson MO/TO series
         "msx",                  // MSX
         "msx2",                 // MSX2
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index ac658188f..95525664b 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -82,7 +82,6 @@ namespace PlatformIds
         SEGA_MEGA_DRIVE,
         CREATRONIC_MEGA_DUCK,
         MESS,
-        MOONLIGHT,
         THOMSON_MOTO,
         MSX,
         MSX2,
diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp
index a30fe18d5..1fc1fddea 100644
--- a/es-app/src/scrapers/GamesDBJSONScraper.cpp
+++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp
@@ -77,7 +77,6 @@ namespace
         {LCD_GAMES, "4951"},
         {MICROSOFT_XBOX, "14"},
         {MICROSOFT_XBOX_360, "15"},
-        {MOONLIGHT, "1"},
         {MSX, "4929"},
         {MSX2, "4929"},
         {MSX_TURBO_R, "4929"},
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index fdff92249..dafbc3c96 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -79,7 +79,6 @@ namespace
         {LCD_GAMES, 75},
         {MICROSOFT_XBOX, 32},
         {MICROSOFT_XBOX_360, 33},
-        {MOONLIGHT, 138},
         {MSX, 113},
         {MSX2, 116},
         {MSX_TURBO_R, 118},
diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index f689b22db..e72537431 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -365,10 +365,6 @@
         <name>model3</name>
         <systemsortname>Arcade - 1996</systemsortname>
     </system>
-    <system>
-        <name>moonlight</name>
-        <systemsortname>Folder - 2014</systemsortname>
-    </system>
     <system>
         <name>moto</name>
         <systemsortname>Computer - 1984</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index 51786f63e..25e166155 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -365,10 +365,6 @@
         <name>model3</name>
         <systemsortname>Sega - Arcade - 1996</systemsortname>
     </system>
-    <system>
-        <name>moonlight</name>
-        <systemsortname>CWR University - Folder - 2014</systemsortname>
-    </system>
     <system>
         <name>moto</name>
         <systemsortname>Thomson SA - Computer - 1984</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index 158ed74b1..947946f04 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -365,10 +365,6 @@
         <name>model3</name>
         <systemsortname>Sega - 1996</systemsortname>
     </system>
-    <system>
-        <name>moonlight</name>
-        <systemsortname>CWR University - 2014</systemsortname>
-    </system>
     <system>
         <name>moto</name>
         <systemsortname>Thomson SA - 1984</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index e42c2c539..e1042daed 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -365,10 +365,6 @@
         <name>model3</name>
         <systemsortname>1996</systemsortname>
     </system>
-    <system>
-        <name>moonlight</name>
-        <systemsortname>2014</systemsortname>
-    </system>
     <system>
         <name>moto</name>
         <systemsortname>1984</systemsortname>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 300de4899..dc1f4f2f5 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1051,15 +1051,6 @@
         <platform>arcade</platform>
         <theme>model3</theme>
     </system>
-    <system>
-        <name>moonlight</name>
-        <fullname>Moonlight Game Streaming</fullname>
-        <path>%ROMPATH%/moonlight</path>
-        <extension>.moonlight .MOONLIGHT .7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
-        <platform>moonlight</platform>
-        <theme>moonlight</theme>
-    </system>
     <system>
         <name>moto</name>
         <fullname>Thomson MO/TO Series</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index 35c735aa1..c73415c8a 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1098,15 +1098,6 @@
         <platform>arcade</platform>
         <theme>model3</theme>
     </system>
-    <system>
-        <name>moonlight</name>
-        <fullname>Moonlight Game Streaming</fullname>
-        <path>%ROMPATH%/moonlight</path>
-        <extension>.moonlight .MOONLIGHT .7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
-        <platform>moonlight</platform>
-        <theme>moonlight</theme>
-    </system>
     <system>
         <name>moto</name>
         <fullname>Thomson MO/TO Series</fullname>
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 75f19cc8d..cb909cfa8 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1089,15 +1089,6 @@
         <platform>arcade</platform>
         <theme>model3</theme>
     </system>
-    <system>
-        <name>moonlight</name>
-        <fullname>Moonlight Game Streaming</fullname>
-        <path>%ROMPATH%\moonlight</path>
-        <extension>.moonlight .MOONLIGHT .7z .7Z .zip .ZIP</extension>
-        <command>PLACEHOLDER %ROM%</command>
-        <platform>moonlight</platform>
-        <theme>moonlight</theme>
-    </system>
     <system>
         <name>moto</name>
         <fullname>Thomson MO/TO Series</fullname>