diff --git a/common/globalvar.c b/common/globalvar.c
index 9bb363f..d33bc64 100644
--- a/common/globalvar.c
+++ b/common/globalvar.c
@@ -99,9 +99,6 @@
 	const char *val;
 	int ret = 0;
 
-	if (!IS_ENABLED(CONFIG_NVVAR))
-		return;
-
 	if (dev == &nv_device)
 		return;
 	if (dev == &global_device)
@@ -398,9 +395,6 @@
 {
 	const char *val;
 
-	if (!IS_ENABLED(CONFIG_NVVAR))
-		return;
-
 	val = dev_get_param(&nv_device, name);
 	if (val)
 		dev_set_param(&global_device, name, val);
@@ -534,8 +528,6 @@
 	const char *env = default_environment_path_get();
 	int ret;
 #define TMPDIR "/.env.tmp"
-	if (!IS_ENABLED(CONFIG_NVVAR))
-		return -ENOSYS;
 	if (!nv_dirty || !env)
 		return 0;
 
@@ -596,9 +588,7 @@
 int nv_global_complete(struct string_list *sl, char *instr)
 {
 	nv_global_param_complete(&global_device, sl, instr, 0);
-
-	if (IS_ENABLED(CONFIG_NVVAR))
-		nv_global_param_complete(&nv_device, sl, instr, 0);
+	nv_global_param_complete(&nv_device, sl, instr, 0);
 
 	return 0;
 }