diff --git a/src/onegate/onegate-server.rb b/src/onegate/onegate-server.rb
index b362cbf8e8..2460fc58ad 100644
--- a/src/onegate/onegate-server.rb
+++ b/src/onegate/onegate-server.rb
@@ -521,7 +521,9 @@ helpers do
         # Replace escaped \n by no scaped one
         ret.gsub!("\\n", "\n")
 
-        ret.insert(ret.size, "\"") if ret[-1] != ']' && ret[-1] != "\""
+        if escape && ret[-1] != ']' && ret[-1] != "\""
+            ret.insert(ret.size, "\"")
+        end
 
         ret
     end