diff --git a/build.gradle b/build.gradle
index d995fbf11..f0261f6b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -200,7 +200,10 @@ subprojects { p ->
         implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
 
         // JOML
-        forgeShadowMe("org.joml:joml:${rootProject.joml_version}")
+        if (project.hasProperty("embed_joml") && embed_joml == "true")
+            forgeShadowMe("org.joml:joml:${rootProject.joml_version}")
+        else
+            implementation("org.joml:joml:${rootProject.joml_version}")
 
         // JUnit tests
         implementation("org.junit.jupiter:junit-jupiter:5.8.2")
@@ -300,7 +303,8 @@ subprojects { p ->
 //        relocate "org.sqlite", "${librariesLocation}.sqlite"
         
         // JOML
-        relocate "org.joml", "${librariesLocation}.joml"
+        if (project.hasProperty("embed_joml") && embed_joml == "true")
+            relocate "org.joml", "${librariesLocation}.joml"
 
         // NightConfig (includes Toml & Json)
         relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"
diff --git a/versionProperties/1.16.5.properties b/versionProperties/1.16.5.properties
index dc8d54645..dae7f1dc0 100644
--- a/versionProperties/1.16.5.properties
+++ b/versionProperties/1.16.5.properties
@@ -5,6 +5,7 @@ parchment_version=1.16.5:2022.03.06
 compatible_minecraft_versions=["1.16.4", "1.16.5"]
 accessWidenerVersion=1_16
 builds_for=fabric,forge
+embed_joml=true
 
 # Fabric loader
 fabric_loader_version=0.14.24
diff --git a/versionProperties/1.17.1.properties b/versionProperties/1.17.1.properties
index 44be229a8..4b5b8dfc9 100644
--- a/versionProperties/1.17.1.properties
+++ b/versionProperties/1.17.1.properties
@@ -5,6 +5,7 @@ parchment_version=1.17.1:2021.12.12
 compatible_minecraft_versions=["1.17", "1.17.1"]
 accessWidenerVersion=1_17
 builds_for=fabric,forge
+embed_joml=true
 
 # Fabric loader
 fabric_loader_version=0.14.24
diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties
index e987c439f..e168e4f1b 100644
--- a/versionProperties/1.18.2.properties
+++ b/versionProperties/1.18.2.properties
@@ -5,6 +5,7 @@ parchment_version=1.18.2:2022.11.06
 compatible_minecraft_versions=["1.18.2"]
 accessWidenerVersion=1_18
 builds_for=fabric,forge
+embed_joml=true
 
 # Fabric loader
 fabric_loader_version=0.14.24
diff --git a/versionProperties/1.19.2.properties b/versionProperties/1.19.2.properties
index c4fe3195f..34e38b150 100644
--- a/versionProperties/1.19.2.properties
+++ b/versionProperties/1.19.2.properties
@@ -5,6 +5,7 @@ parchment_version=1.19.2:2022.11.27
 compatible_minecraft_versions=["1.19.2"]
 accessWidenerVersion=1_19_2
 builds_for=fabric,forge
+embed_joml=true
 
 # Fabric loader
 fabric_loader_version=0.14.24
diff --git a/versionProperties/1.19.4.properties b/versionProperties/1.19.4.properties
index c3a91dfda..0d0691a44 100644
--- a/versionProperties/1.19.4.properties
+++ b/versionProperties/1.19.4.properties
@@ -5,6 +5,7 @@ parchment_version=1.19.4:2023.06.26
 compatible_minecraft_versions=["1.19.4"]
 accessWidenerVersion=1_19_4
 builds_for=fabric,forge
+embed_joml=true
 
 # Fabric loader
 fabric_loader_version=0.14.24