diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index ccaba559fd..177b5586a1 100644
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -1823,7 +1823,7 @@ static JSBool session_set_variable(JSContext * cx, JSObject * obj, uintN argc, j
 
 		var = JS_GetStringBytes(JS_ValueToString(cx, argv[0]));
 		val = JS_GetStringBytes(JS_ValueToString(cx, argv[1]));
-		switch_channel_set_variable(channel, var, val);
+		switch_channel_set_variable_var_check(channel, var, val, SWITCH_FALSE);
 		*rval = BOOLEAN_TO_JSVAL(JS_TRUE);
 	} else {
 		*rval = BOOLEAN_TO_JSVAL(JS_FALSE);
diff --git a/src/switch_cpp.cpp b/src/switch_cpp.cpp
index ec4c9c40b4..5368cdddeb 100644
--- a/src/switch_cpp.cpp
+++ b/src/switch_cpp.cpp
@@ -623,7 +623,7 @@ SWITCH_DECLARE(void) CoreSession::setVariable(char *var, char *val)
 {
 	this_check_void();
 	sanity_check_noreturn;
-    switch_channel_set_variable(channel, var, val);
+	switch_channel_set_variable_var_check(channel, var, val, SWITCH_FALSE);
 }
 
 SWITCH_DECLARE(const char *)CoreSession::getVariable(char *var)