diff --git a/terraform/eval_context_builtin.go b/terraform/eval_context_builtin.go
index af46a23bb0..4d0cc590b5 100644
--- a/terraform/eval_context_builtin.go
+++ b/terraform/eval_context_builtin.go
@@ -146,7 +146,7 @@ func (ctx *BuiltinEvalContext) CloseProvider(addr addrs.ProviderConfig) error {
 	ctx.ProviderLock.Lock()
 	defer ctx.ProviderLock.Unlock()
 
-	key := addr.String()
+	key := addr.Absolute(ctx.Path()).String()
 	var provider interface{}
 	provider = ctx.ProviderCache[key]
 	if provider != nil {