diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp
index c427791b3..114bfb617 100644
--- a/src/slic3r/GUI/CalibrationWizard.cpp
+++ b/src/slic3r/GUI/CalibrationWizard.cpp
@@ -761,6 +761,8 @@ void PressureAdvanceWizard::on_cali_start()
             Preset *preset               = selected_filaments.begin()->second;
             Preset * temp_filament_preset = new Preset(preset->type, preset->name + "_temp");
             temp_filament_preset->config = preset->config;
+            if (preset->type == Preset::TYPE_FILAMENT)
+                temp_filament_preset->filament_id = preset->filament_id;
 
             calib_info.bed_type      = plate_type;
             calib_info.process_bar   = preset_page->get_sending_progress_bar();
@@ -1234,6 +1236,8 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, Flow
             Preset* preset = selected_filaments.begin()->second;
             temp_filament_preset = new Preset(preset->type, preset->name + "_temp");
             temp_filament_preset->config = preset->config;
+            if (preset->type == Preset::TYPE_FILAMENT)
+                temp_filament_preset->filament_id = preset->filament_id;
 
             calib_info.bed_type = plate_type;
             calib_info.printer_prest = preset_page->get_printer_preset(curr_obj, preset_page->get_nozzle_diameter(calib_info.extruder_id));
diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp
index 14ea679ef..bb85f315f 100644
--- a/src/slic3r/Utils/CalibUtils.cpp
+++ b/src/slic3r/Utils/CalibUtils.cpp
@@ -689,6 +689,8 @@ bool CalibUtils::calib_flowrate(int pass, const CalibInfo &calib_info, wxString
     full_config.apply(filament_config);
     full_config.apply(printer_config);
 
+    full_config.set_key_value("filament_ids", new ConfigOptionStrings({calib_info.filament_prest->filament_id}));
+
     init_multi_extruder_params_for_cali(full_config, calib_info);
 
     Calib_Params params;
@@ -816,6 +818,8 @@ bool CalibUtils::calib_generic_PA(const CalibInfo &calib_info, wxString &error_m
     full_config.apply(filament_config);
     full_config.apply(printer_config);
 
+    full_config.set_key_value("filament_ids", new ConfigOptionStrings({calib_info.filament_prest->filament_id}));
+
     init_multi_extruder_params_for_cali(full_config, calib_info);
 
     if (!process_and_store_3mf(&model, full_config, params, error_message))