diff --git a/src/compiler/codegen/index.js b/src/compiler/codegen/index.js
index 9eb705abf..42fe18874 100644
--- a/src/compiler/codegen/index.js
+++ b/src/compiler/codegen/index.js
@@ -75,7 +75,7 @@ export function genElement (el: ASTElement, state: CodegenState): string {
       code = genComponent(el.component, el, state)
     } else {
       let data
-      if (!el.plain || el.pre) {
+      if (!el.plain || (el.pre && state.maybeComponent(el))) {
         data = genData(el, state)
       }