diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
index 93c34b56a..f1a411585 100644
--- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
+++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java
@@ -166,10 +166,10 @@ private synchronized void setupMinecraft(ConfigContext configContext) throws Exc
 		extension.setMinecraftProvider(minecraftProvider);
 		minecraftProvider.provide();
 
-		// Created any layered mapping files.
+		final DependencyInfo mappingsDep = DependencyInfo.create(getProject(), Configurations.MAPPINGS);
+		// Created any layered mapping files. (After resolving the mappings dependency)
 		LayeredMappingsFactory.afterEvaluate(configContext);
 
-		final DependencyInfo mappingsDep = DependencyInfo.create(getProject(), Configurations.MAPPINGS);
 		final MappingConfiguration mappingConfiguration = MappingConfiguration.create(getProject(), configContext.serviceFactory(), mappingsDep, minecraftProvider);
 		extension.setMappingConfiguration(mappingConfiguration);
 		mappingConfiguration.applyToProject(getProject(), mappingsDep);
diff --git a/src/test/groovy/net/fabricmc/loom/test/integration/LazyLayeredMappingsTest.groovy b/src/test/groovy/net/fabricmc/loom/test/integration/LazyLayeredMappingsTest.groovy
new file mode 100644
index 000000000..482dedc28
--- /dev/null
+++ b/src/test/groovy/net/fabricmc/loom/test/integration/LazyLayeredMappingsTest.groovy
@@ -0,0 +1,50 @@
+/*
+ * This file is part of fabric-loom, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) 2018-2021 FabricMC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package net.fabricmc.loom.test.integration
+
+import spock.lang.Specification
+import spock.lang.Unroll
+
+import net.fabricmc.loom.test.util.GradleProjectTestTrait
+
+import static net.fabricmc.loom.test.LoomTestConstants.STANDARD_TEST_VERSIONS
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+class LazyLayeredMappingsTest extends Specification implements GradleProjectTestTrait {
+	@Unroll
+	def "Ensure mappings configuration is lazy when using layered #version"() {
+		setup:
+		def gradle = gradleProject(project: "lazyLayeredMappings", version: version)
+
+		when:
+		def result = gradle.run(task: "build")
+
+		then:
+		result.task(":build").outcome == SUCCESS
+
+		where:
+		version << STANDARD_TEST_VERSIONS
+	}
+}
diff --git a/src/test/resources/projects/lazyLayeredMappings/build.gradle b/src/test/resources/projects/lazyLayeredMappings/build.gradle
new file mode 100644
index 000000000..0f7780158
--- /dev/null
+++ b/src/test/resources/projects/lazyLayeredMappings/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+	id 'fabric-loom'
+}
+
+dependencies {
+	minecraft libs.minecraft
+	mappings project.provider {
+		loom.layered() {
+			officialMojangMappings()
+		}
+	}
+
+	modImplementation libs.fabricLoader
+}
diff --git a/src/test/resources/projects/lazyLayeredMappings/gradle/libs.versions.toml b/src/test/resources/projects/lazyLayeredMappings/gradle/libs.versions.toml
new file mode 100644
index 000000000..dc3eba934
--- /dev/null
+++ b/src/test/resources/projects/lazyLayeredMappings/gradle/libs.versions.toml
@@ -0,0 +1,7 @@
+[versions]
+minecraft = "1.16.5"
+fabricLoader = "0.11.3"
+
+[libraries]
+minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
+fabricLoader = { module = "net.fabricmc:fabric-loader", version.ref = "fabricLoader" }
\ No newline at end of file