diff --git a/api-gateway-config/scripts/lua/management/apis.lua b/api-gateway-config/scripts/lua/management/apis.lua
index 0b4ed45..e6a3295 100644
--- a/api-gateway-config/scripts/lua/management/apis.lua
+++ b/api-gateway-config/scripts/lua/management/apis.lua
@@ -287,9 +287,9 @@
         apiList[#apiList+1] = cjson.decode(v)
       end
     end
-    apiList = (next(apiList) == nil) and "[]" or cjson.encode(apiList)
   end
   ngx.header.content_type = "application/json; charset=utf-8"
+  apiList = (next(apiList) == nil) and "[]" or cjson.encode(apiList)
   request.success(200, apiList)
 end
 
@@ -315,7 +315,7 @@
       end
     end
   end
-  return cjson.encode(apiList)
+  return apiList
 end
 
 --- Get API by its id
diff --git a/api-gateway-config/scripts/lua/management/tenants.lua b/api-gateway-config/scripts/lua/management/tenants.lua
index fe067c1..eb29e39 100644
--- a/api-gateway-config/scripts/lua/management/tenants.lua
+++ b/api-gateway-config/scripts/lua/management/tenants.lua
@@ -146,9 +146,9 @@
         tenantList[#tenantList+1] = cjson.decode(v)
       end
     end
-    tenantList = (next(tenantList) == nil) and "[]" or cjson.encode(tenantList) 
   end
   ngx.header.content_type = "application/json; charset=utf-8"
+  tenantList = (next(tenantList) == nil) and "[]" or cjson.encode(tenantList)
   request.success(200, tenantList)
 end
 
@@ -173,7 +173,7 @@
       end
     end
   end
-  return cjson.encode(tenantList)
+  return tenantList
 end
 
 --- Get tenant by its id
@@ -210,9 +210,9 @@
         end
       end
     end
-    apiList = (next(apiList) == nil) and "[]" cjson.encode(apiList) 
   end
   ngx.header.content_type = "application/json; charset=utf-8"
+  apiList = (next(apiList) == nil) and "[]" or cjson.encode(apiList)
   request.success(200, apiList)
 end
 
@@ -238,7 +238,7 @@
       end
     end
   end
-  return cjson.encode(apiList)
+  return apiList
 end
 
 --- Delete tenant from gateway