diff --git a/india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py b/india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py
index 24caf1f6ea..83844fb93c 100644
--- a/india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py
+++ b/india_compliance/gst_india/doctype/gst_return_log/generate_gstr_1.py
@@ -555,6 +555,13 @@ def generate_gstr1_data(self, filters, callback=None):
         else:
             gov_data_field = "unfiled"
 
+        if (
+            status != "Filed"
+            and frappe.get_cached_value("GST Settings", None, "compare_unfiled_data")
+            != 1
+        ):
+            return self.generate_only_books_data(data, filters, callback)
+
         # Get Data
         try:
             gov_data, is_enqueued = self.get_gov_gstr1_data()
@@ -595,9 +602,6 @@ def generate_only_books_data(self, data, filters, callback=None):
 
     # GET DATA
     def get_gov_gstr1_data(self):
-        if frappe.get_cached_value("GST Settings", None, "compare_unfiled_data") != 1:
-            return frappe._dict(), False
-
         if self.filing_status == "Filed":
             data_field = "filed"
         else:
@@ -628,7 +632,6 @@ def handle_gstr1_gov_failure(self, data, filters, error):
                 "error_log": error_log.name,
             },
             user=frappe.session.user,
-            doctype=self.doctype,
         )
 
     def get_books_gstr1_data(self, filters, aggregate=False):
diff --git a/india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py b/india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py
index 9eae1caa38..aa52e04a0e 100644
--- a/india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py
+++ b/india_compliance/gst_india/doctype/gst_return_log/gst_return_log.py
@@ -190,13 +190,14 @@ def get_applicable_file_fields(self, settings=None):
         fields = ["books", "books_summary"]
 
         if self.is_gstr1_api_enabled(settings):
-            fields.extend(["reconcile", "reconcile_summary"])
-
             if self.filing_status == "Filed":
-                fields.extend(["filed", "filed_summary"])
-            else:
-                if settings.compare_unfiled_data:
-                    fields.extend(["unfiled", "unfiled_summary"])
+                fields.extend(
+                    ["reconcile", "reconcile_summary", "filed", "filed_summary"]
+                )
+            elif settings.compare_unfiled_data:
+                fields.extend(
+                    ["reconcile", "reconcile_summary", "unfiled", "unfiled_summary"]
+                )
 
         return fields