diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 8173f5d0af2..4e16eea2774 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -1650,10 +1650,12 @@ TextureCoordinateNode::TextureCoordinateNode()
 
 void TextureCoordinateNode::attributes(AttributeRequestSet *attributes)
 {
-	if(!output("Generated")->links.empty())
-		attributes->add(ATTR_STD_GENERATED);
-	if(!output("UV")->links.empty())
-		attributes->add(ATTR_STD_UV);
+	if(!from_dupli) {
+		if(!output("Generated")->links.empty())
+			attributes->add(ATTR_STD_GENERATED);
+		if(!output("UV")->links.empty())
+			attributes->add(ATTR_STD_UV);
+	}
 
 	ShaderNode::attributes(attributes);
 }
@@ -1704,14 +1706,14 @@ void TextureCoordinateNode::compile(SVMCompiler& compiler)
 	out = output("UV");
 	if(!out->links.empty()) {
 		if(from_dupli) {
+			compiler.stack_assign(out);
+			compiler.add_node(texco_node, NODE_TEXCO_DUPLI_UV, out->stack_offset);
+		}
+		else {
 			int attr = compiler.attribute(ATTR_STD_UV);
 			compiler.stack_assign(out);
 			compiler.add_node(attr_node, attr, out->stack_offset, NODE_ATTR_FLOAT3);
 		}
-		else {
-			compiler.stack_assign(out);
-			compiler.add_node(texco_node, NODE_TEXCO_DUPLI_UV, out->stack_offset);
-		}
 	}
 
 	out = output("Object");