diff --git a/src/main/java/dev/architectury/loom/forge/tool/ForgeToolExecutor.java b/src/main/java/dev/architectury/loom/forge/tool/ForgeToolExecutor.java
index c793cd23..6719d876 100644
--- a/src/main/java/dev/architectury/loom/forge/tool/ForgeToolExecutor.java
+++ b/src/main/java/dev/architectury/loom/forge/tool/ForgeToolExecutor.java
@@ -5,7 +5,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import org.apache.commons.io.output.NullOutputStream;
+import dev.architectury.loom.util.NullOutputStream;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.file.ConfigurableFileCollection;
@@ -77,13 +77,13 @@ public abstract class ForgeToolExecutor {
 			if (settings.getShowVerboseStdout().get()) {
 				spec.setStandardOutput(System.out);
 			} else {
-				spec.setStandardOutput(NullOutputStream.NULL_OUTPUT_STREAM);
+				spec.setStandardOutput(NullOutputStream.INSTANCE);
 			}
 
 			if (settings.getShowVerboseStderr().get()) {
 				spec.setErrorOutput(System.err);
 			} else {
-				spec.setErrorOutput(NullOutputStream.NULL_OUTPUT_STREAM);
+				spec.setErrorOutput(NullOutputStream.INSTANCE);
 			}
 		});
 	}
diff --git a/src/main/java/dev/architectury/loom/util/NullOutputStream.java b/src/main/java/dev/architectury/loom/util/NullOutputStream.java
new file mode 100644
index 00000000..af751d86
--- /dev/null
+++ b/src/main/java/dev/architectury/loom/util/NullOutputStream.java
@@ -0,0 +1,30 @@
+package dev.architectury.loom.util;
+
+import java.io.OutputStream;
+
+public final class NullOutputStream extends OutputStream {
+	public static final NullOutputStream INSTANCE = new NullOutputStream();
+
+	private NullOutputStream() {
+	}
+
+	@Override
+	public void write(int b) {
+		// no-op
+	}
+
+	@Override
+	public void write(byte[] b) {
+		// no-op
+	}
+
+	@Override
+	public void write(byte[] b, int off, int len) {
+		// no-op
+	}
+
+	@Override
+	public void close() {
+		// no-op
+	}
+}
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java
index 2394ce19..2b77764c 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/SrgProvider.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.google.common.base.Stopwatch;
-import org.apache.commons.io.output.NullOutputStream;
+import dev.architectury.loom.util.NullOutputStream;
 import org.gradle.api.Project;
 import org.gradle.api.logging.LogLevel;
 import org.jetbrains.annotations.Nullable;
@@ -88,8 +88,8 @@ public class SrgProvider extends DependencyProvider {
 				PrintStream err = System.err;
 
 				if (getProject().getGradle().getStartParameter().getLogLevel().compareTo(LogLevel.LIFECYCLE) >= 0) {
-					System.setOut(new PrintStream(NullOutputStream.NULL_OUTPUT_STREAM));
-					System.setErr(new PrintStream(NullOutputStream.NULL_OUTPUT_STREAM));
+					System.setOut(new PrintStream(NullOutputStream.INSTANCE));
+					System.setErr(new PrintStream(NullOutputStream.INSTANCE));
 				}
 
 				Files.deleteIfExists(mergedMojangRaw);
diff --git a/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java b/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java
index 7d53c02e..c44dd0aa 100644
--- a/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java
+++ b/src/main/java/net/fabricmc/loom/configuration/sources/ForgeSourcesRemapper.java
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 
 import dev.architectury.loom.forge.tool.ForgeToolExecutor;
 import dev.architectury.loom.util.MappingOption;
-import org.apache.commons.io.output.NullOutputStream;
+import dev.architectury.loom.util.NullOutputStream;
 import org.cadixdev.lorenz.MappingSet;
 import org.cadixdev.mercury.Mercury;
 import org.cadixdev.mercury.remapper.MercuryRemapper;
@@ -171,8 +171,8 @@ public class ForgeSourcesRemapper {
 		PrintStream err = System.err;
 
 		if (!ForgeToolExecutor.shouldShowVerboseStderr(project)) {
-			System.setOut(new PrintStream(NullOutputStream.NULL_OUTPUT_STREAM));
-			System.setErr(new PrintStream(NullOutputStream.NULL_OUTPUT_STREAM));
+			System.setOut(new PrintStream(NullOutputStream.INSTANCE));
+			System.setErr(new PrintStream(NullOutputStream.INSTANCE));
 		}
 
 		remapForgeSourcesInner(project, serviceFactory, tmpInput.toPath(), tmpOutput.toPath());