diff --git a/libemile/emile_second_set_param.c b/libemile/emile_second_set_param.c
index 72e1405..7d86716 100644
--- a/libemile/emile_second_set_param.c
+++ b/libemile/emile_second_set_param.c
@@ -24,12 +24,18 @@ int emile_second_set_param(int fd, char *kernel, char *parameters, char *initrd)
 
 	if (kernel != NULL)
 		emile_second_set_property(configuration, "kernel", kernel);
+	else
+		emile_second_remove_property(configuration, "kernel");
 
 	if (parameters != NULL)
 		emile_second_set_property(configuration, "parameters", parameters);
+	else
+		emile_second_remove_property(configuration, "parameters");
 
 	if (initrd != NULL)
 		emile_second_set_property(configuration, "initrd", initrd);
+	else
+		emile_second_remove_property(configuration, "initrd");
 		
 	emile_second_set_property(configuration, "vga", "default");