diff --git a/patches/server/0713-Update-oshi-core-dependency.patch b/patches/server/0713-Update-oshi-core-dependency.patch
new file mode 100644
index 0000000000..ff5f3d5c62
--- /dev/null
+++ b/patches/server/0713-Update-oshi-core-dependency.patch
@@ -0,0 +1,20 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: KennyTV <jahnke.nassim@gmail.com>
+Date: Sat, 19 Jun 2021 09:55:41 +0200
+Subject: [PATCH] Update oshi-core dependency
+
+This is fixed in Vanilla 1.17.1, so remove this patch when updating.
+
+diff --git a/build.gradle.kts b/build.gradle.kts
+index 03521590dfcbb09416097e793fae5951c1ae3cc0..04938bb10c35d2e424043adb7ed8fec2e42bb816 100644
+--- a/build.gradle.kts
++++ b/build.gradle.kts
+@@ -50,6 +50,8 @@ dependencies {
+     implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
+     implementation("io.netty:netty-all:4.1.65.Final") // Paper
+ 
++    implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning
++
+     testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
+     testImplementation("junit:junit:4.13.1")
+     testImplementation("org.hamcrest:hamcrest-library:1.3")