diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index c4e336c78..b11189906 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1020,7 +1020,7 @@ class Context {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
 		$self->context->{$key} = $val;
 		if($set_to_get_vars === false) return;
-		if(empty($val))
+		if($val === NULL || $val === '')
 		{
 			unset($self->get_vars->{$key});
 			return;