diff --git a/terraform/node_resource_plan.go b/terraform/node_resource_plan.go
index 8faf8e0de..9bbeedd15 100644
--- a/terraform/node_resource_plan.go
+++ b/terraform/node_resource_plan.go
@@ -52,6 +52,9 @@ func (n *NodePlannableResource) DynamicExpand(ctx EvalContext) (*Graph, error) {
 
 	// The concrete resource factory we'll use for oprhans
 	concreteResourceOrphan := func(a *NodeAbstractResource) dag.Vertex {
+		// Add the config and state since we don't do that via transforms
+		a.Config = n.Config
+
 		return &NodePlannableResourceOrphan{
 			NodeAbstractResource: a,
 		}
diff --git a/terraform/node_resource_plan_orphan.go b/terraform/node_resource_plan_orphan.go
index e8d700bde..e7c749730 100644
--- a/terraform/node_resource_plan_orphan.go
+++ b/terraform/node_resource_plan_orphan.go
@@ -47,8 +47,9 @@ func (n *NodePlannableResourceOrphan) EvalTree() EvalNode {
 				Output: &diff,
 			},
 			&EvalCheckPreventDestroy{
-				Resource: n.Config,
-				Diff:     &diff,
+				Resource:   n.Config,
+				ResourceId: stateId,
+				Diff:       &diff,
 			},
 			&EvalWriteDiff{
 				Name: stateId,