diff --git a/nginx/ngx_http_js_module.c b/nginx/ngx_http_js_module.c
index c34fccbdd..6f0262939 100644
--- a/nginx/ngx_http_js_module.c
+++ b/nginx/ngx_http_js_module.c
@@ -3474,7 +3474,6 @@ ngx_http_js_ext_subrequest(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs,
         return NJS_ERROR;
     }
 
-    promise = 0;
     flags = NGX_HTTP_SUBREQUEST_BACKGROUND;
 
     njs_value_undefined_set(retval);
@@ -5859,7 +5858,6 @@ ngx_http_qjs_ext_subrequest(JSContext *cx, JSValueConst this_val,
                                      "exclusive");
     }
 
-    promise = 0;
     retval = JS_UNDEFINED;
     flags = NGX_HTTP_SUBREQUEST_BACKGROUND;
 
diff --git a/nginx/ngx_js.c b/nginx/ngx_js.c
index 98e48dc2c..152045f03 100644
--- a/nginx/ngx_js.c
+++ b/nginx/ngx_js.c
@@ -3360,7 +3360,7 @@ ngx_js_merge_vm(ngx_conf_t *cf, ngx_js_loc_conf_t *conf,
     ngx_js_named_path_t  *import, *pi, *pij, *preload;
 
     if (conf->imports == NGX_CONF_UNSET_PTR
-        && conf->type == NGX_CONF_UNSET_UINT
+        && conf->type == prev->type
         && conf->paths == NGX_CONF_UNSET_PTR
         && conf->preload_objects == NGX_CONF_UNSET_PTR)
     {