diff --git a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java
index db8e0d7cb..8885b2fed 100644
--- a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java
+++ b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java
@@ -94,7 +94,7 @@ public class ModNioResourcePack implements ResourcePack, ModResourcePack {
 
 		if (paths.isEmpty()) return null;
 
-		String packId = subPath == null ? id : id + "_" + subPath;
+		String packId = subPath != null && modBundled ? id + "_" + subPath : id;
 		ModNioResourcePack ret = new ModNioResourcePack(packId, mod, paths, type, activationType, modBundled);
 
 		return ret.getNamespaces(type).isEmpty() ? null : ret;
diff --git a/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/unittests/SingleVariantItemStorageTests.java b/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/unittests/SingleVariantItemStorageTests.java
index da948cd5d..1919da8ba 100644
--- a/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/unittests/SingleVariantItemStorageTests.java
+++ b/fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/unittests/SingleVariantItemStorageTests.java
@@ -84,7 +84,7 @@ public class SingleVariantItemStorageTests {
 			tx.commit();
 		}
 
-		// Check custom name.
+		// Check custom name.It
 		assertEquals(customName, inv.getStack(0).getName());
 		assertEquals(FluidVariant.blank(), getFluid(inv.getStack(0)));
 		assertEquals(0L, getAmount(inv.getStack(0)));