diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index be02ec7ad5..c4cf2be2e3 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -2271,7 +2271,13 @@ void SelectMachineDialog::on_ok_btn(wxCommandEvent &event)
 
     for (auto warning : plate->get_slice_result()->warnings) {
         if (warning.msg == BED_TEMP_TOO_HIGH_THAN_FILAMENT) {
-            if ((obj_->printer_type == "BL-P001" || obj_->printer_type == "BL-P002")) {
+            if ((obj_->get_printer_series() == PrinterSeries::SERIES_X1)) {
+                confirm_text.push_back(Plater::get_slice_warning_string(warning) + "\n");
+                has_slice_warnings = true;
+            }
+        }
+        else if (warning.msg == NOT_SUPPORT_TRADITIONAL_TIMELAPSE) {
+            if (obj_->get_printer_arch() == PrinterArch::ARCH_I3 && m_checkbox_list["timelapse"]->GetValue()) {
                 confirm_text.push_back(Plater::get_slice_warning_string(warning) + "\n");
                 has_slice_warnings = true;
             }