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 225c4e43d..c9537291c 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
@@ -553,6 +553,7 @@ def get_gstr1_data(self):
         data = data
         data["status"] = self.filing_status or "Not Filed"
         data["is_nil"] = self.is_nil
+        data["filing_preference"] = self.filing_preference
 
         if error_data := self.get_json_for("upload_error"):
             data["errors"] = error_data
diff --git a/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js b/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js
index 280cd780c..6a1c1a116 100644
--- a/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js
+++ b/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.js
@@ -188,6 +188,11 @@ frappe.ui.form.on(DOCTYPE, {
             }
 
             frm.taxpayer_api_call("generate_gstr1", { only_books_data }).then(r => {
+                if (!frm.doc.filing_preference) {
+                    frm.doc.filing_preference = r.message.filing_preference;
+                    frm.refresh_field("filing_preference");
+                }
+
                 frm.doc.__gst_data = r.message;
                 frm.trigger("load_gstr1_data");
             });
diff --git a/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.py b/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.py
index 20633507e..e80d5f6ab 100644
--- a/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.py
+++ b/india_compliance/gst_india/doctype/gstr_1_beta/gstr_1_beta.py
@@ -97,6 +97,9 @@ def generate_gstr1(
             recompute_books = True
             gstr1_log.db_set("filing_preference", self.filing_preference)
 
+        if not gstr1_log.filing_preference:
+            recompute_books = True
+
         if sync_for:
             gstr1_log.remove_json_for(sync_for)