diff --git a/src/idl_gen_js.cpp b/src/idl_gen_js.cpp
index 8c7e713a8..5cd3a0fed 100644
--- a/src/idl_gen_js.cpp
+++ b/src/idl_gen_js.cpp
@@ -469,7 +469,7 @@ class JsGenerator : public BaseGenerator {
                                   const std::string &file) {
     const auto basename =
         flatbuffers::StripPath(flatbuffers::StripExtension(file));
-    if (basename == file_name_) { return typeName; }
+    if (basename == file_name_ || parser_.opts.generate_all) { return typeName; }
     return GenFileNamespacePrefix(file) + "." + typeName;
   }
 
@@ -741,7 +741,7 @@ class JsGenerator : public BaseGenerator {
               code += ", " + GenBBAccess() + ") : null;\n";
             }
 
-            if (lang_.language == IDLOptions::kTs) {
+            if (lang_.language == IDLOptions::kTs && !parser_.opts.generate_all) {
               imported_files.insert(field.value.type.struct_def->file);
             }
 
@@ -787,7 +787,10 @@ class JsGenerator : public BaseGenerator {
                 vectortypename = GenPrefixedTypeName(
                     vectortypename, vectortype.struct_def->file);
                 code += prefix + ", obj?:" + vectortypename;
-                imported_files.insert(vectortype.struct_def->file);
+
+                if (!parser_.opts.generate_all) {
+                    imported_files.insert(vectortype.struct_def->file);
+                }
               } else if (vectortype.base_type == BASE_TYPE_STRING) {
                 code += prefix + "):string\n";
                 code += prefix + ",optionalEncoding:flatbuffers.Encoding" +