diff --git a/src/components/tree/TreeNode.vue b/src/components/tree/TreeNode.vue
index fa8847f68..72a1ededd 100755
--- a/src/components/tree/TreeNode.vue
+++ b/src/components/tree/TreeNode.vue
@@ -12,7 +12,8 @@
             </div>
             <span :class="icon"></span>
             <span class="p-treenode-label">
-                <TreeNodeTemplate :node="node" :template="templates[node.type]||templates['default']" />
+                <component :is="templates[node.type]||templates['default']" :node="node" v-if="templates[node.type]||templates['default']"/>
+                <template v-else>{{node.label}}</template>
             </span>
         </div>
         <ul class="p-treenode-children" role="group" v-if="hasChildren && expanded">
@@ -28,27 +29,6 @@
 import DomHandler from '../utils/DomHandler';
 import Ripple from '../ripple/Ripple';
 
-const TreeNodeTemplate = {
-    functional: true,
-    props: {
-        node: {
-            type: null,
-            default: null
-        },
-        template: {
-            type: null,
-            default: null
-        }
-    },
-    render(createElement, context) {
-        const content = context.props.template ? context.props.template({
-            'node': context.props.node
-        }): context.props.node.label;
-
-        return [content];
-    }
-};
-
 export default {
     name: 'sub-treenode',
     props: {
@@ -310,9 +290,6 @@ export default {
             return this.selectionKeys ? this.selectionKeys[this.node.key] && this.selectionKeys[this.node.key].partialChecked: false;
         }
     },
-    components: {
-        'TreeNodeTemplate': TreeNodeTemplate
-    },
     directives: {
         'ripple': Ripple
     }
diff --git a/src/views/tree/TreeTemplatingDemo.vue b/src/views/tree/TreeTemplatingDemo.vue
index ed70df592..66706339e 100755
--- a/src/views/tree/TreeTemplatingDemo.vue
+++ b/src/views/tree/TreeTemplatingDemo.vue
@@ -83,7 +83,7 @@ export default {
                     children: [
                         {key: '0-0', label: 'What is Vue.js?', data:'https://vuejs.org/v2/guide/#What-is-Vue-js', type: 'url'},
                         {key: '0-1', label: 'Getting Started', data: 'https://vuejs.org/v2/guide/#Getting-Started', type: 'url'},
-                        {key: '0-2', label: 'Declarative Rendering', data:'https://vuejs.org/v2/guide/#Declarative-Rendering', type:' url'},
+                        {key: '0-2', label: 'Declarative Rendering', data:'https://vuejs.org/v2/guide/#Declarative-Rendering', type:'url'},
                         {key: '0-3', label: 'Conditionals and Loops', data: 'https://vuejs.org/v2/guide/#Conditionals-and-Loops', type: 'url'}
                     ]
                 },