diff --git a/caimira/apps/calculator/static/js/co2_form.js b/caimira/apps/calculator/static/js/co2_form.js
index 6fde640a..59189d37 100644
--- a/caimira/apps/calculator/static/js/co2_form.js
+++ b/caimira/apps/calculator/static/js/co2_form.js
@@ -28,7 +28,7 @@ const CO2_data_form = [
 
 // Method to upload a valid excel file
 function upload_file() {
-	clear_fitting_algorithm();
+	clear_fitting_result_component();
 	$("#generate_fitting_data").show();
 	$("#save_and_dismiss_dialog").hide();
 	var files = document.getElementById("file_upload").files;
@@ -177,7 +177,7 @@ function submit_fitting_algorithm(url) {
 	}
 }
 
-function clear_fitting_algorithm() {
+function clear_fitting_result_component() {
 	$('#generate_fitting_data').prop("disabled", true);
 	$("#display_excel_data tbody").remove();
 	$('#CO2_fitting_result').val('');
@@ -185,5 +185,10 @@ function clear_fitting_algorithm() {
 	$('span.' + "error_text").remove();
 	$('#DIV_CO2_fitting_result').hide();
 	$('#CO2_input_data_div').hide();
+}
+
+function clear_fitting_algorithm() {
+	clear_fitting_result_component();
+	$('#CO2_data_no').click(); 
 	ventilation_from_fitting(false);
 }
diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2
index 2b7f34b3..8880de6d 100644
--- a/caimira/apps/templates/base/calculator.form.html.j2
+++ b/caimira/apps/templates/base/calculator.form.html.j2
@@ -732,7 +732,7 @@
             </div>
           </div>
           <div class="modal-footer">
-            <button type="button" class="btn btn-secondary dismiss_btn_frm_field" data-dismiss="modal" onclick="clear_fitting_algorithm(); $('#CO2_data_no').click();">Discard</button>
+            <button type="button" class="btn btn-secondary dismiss_btn_frm_field" data-dismiss="modal" onclick="clear_fitting_algorithm()">Discard</button>
             <button type="button" id="generate_fitting_data" class="btn btn-primary close_btn_frm_field" onclick="submit_fitting_algorithm('{{ get_calculator_url() }}/co2-fit')" disabled>Fit data</button>
             <button type="button" style="display: none" id="save_and_dismiss_dialog" class="btn btn-primary close_btn_frm_field" data-dismiss="modal">Use fit data</button>
           </div>