diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index bef30a977..c4e336c78 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1020,6 +1020,11 @@ 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))
+		{
+			unset($self->get_vars->{$key});
+			return;
+		}
 		if($set_to_get_vars || $self->get_vars->{$key}) $self->get_vars->{$key} = $val;
 	}