diff --git a/src/shared/shell.c b/src/shared/shell.c
index b503c66..367e255 100644
--- a/src/shared/shell.c
+++ b/src/shared/shell.c
@@ -1145,6 +1145,8 @@ void bt_shell_set_env(const char *name, void *value)
 	struct bt_shell_env *env;
 
 	if (!data.envs) {
+		if (!value)
+			return;
 		data.envs = queue_new();
 		goto done;
 	}
@@ -1153,6 +1155,10 @@ void bt_shell_set_env(const char *name, void *value)
 	if (env)
 		env_destroy(env);
 
+	/* Don't create an env if value is not set */
+	if (!value)
+		return;
+
 done:
 	env = new0(struct bt_shell_env, 1);
 	env->name = strdup(name);