diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c
index b544e753965..ac0010b1d55 100644
--- a/source/blender/editors/space_node/node_templates.c
+++ b/source/blender/editors/space_node/node_templates.c
@@ -246,10 +246,6 @@ static void node_socket_add_replace(const bContext *C, bNodeTree *ntree, bNode *
 						nodeRemLink(ntree, link);
 					}
 
-					if (sock_from->default_value) {
-						MEM_freeN(sock_from->default_value);
-						sock_from->default_value = NULL;
-					}
 					node_socket_copy_default_value(sock_from, sock_prev);
 				}
 			}
diff --git a/source/blender/nodes/intern/node_socket.c b/source/blender/nodes/intern/node_socket.c
index 92d403685d0..a37042c9d70 100644
--- a/source/blender/nodes/intern/node_socket.c
+++ b/source/blender/nodes/intern/node_socket.c
@@ -273,7 +273,7 @@ void node_socket_init_default_value(bNodeSocket *sock)
 void node_socket_copy_default_value(bNodeSocket *to, bNodeSocket *from)
 {
 	/* sanity check */
-	if (!STREQ(to->idname, from->idname))
+	if (to->type != from->type)
 		return;
 	
 	/* make sure both exist */