diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index a2928e23a..01b6f5752 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -3447,15 +3447,16 @@ void SelectMachineDialog::update_show_status()
         }
     }
 
-    if (has_timelapse_warning()) {
-        show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
-        return;
-    }
-
     // no ams
     if (!obj_->has_ams() || !m_checkbox_list["use_ams"]->GetValue()) {
-        if (!has_tips(obj_))
-            show_status(PrintDialogStatus::PrintStatusReadingFinished);
+        if (!has_tips(obj_)) {
+            if (has_timelapse_warning()) {
+                show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
+            }
+            else {
+                show_status(PrintDialogStatus::PrintStatusReadingFinished);
+            }
+        }
         return;
     }
 
@@ -3463,7 +3464,14 @@ void SelectMachineDialog::update_show_status()
         if (!m_checkbox_list["use_ams"]->GetValue()) {
             m_ams_mapping_result.clear();
             sync_ams_mapping_result(m_ams_mapping_result);
-            show_status(PrintDialogStatus::PrintStatusDisableAms);
+
+            if (has_timelapse_warning()) {
+                show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
+            }
+            else {
+                show_status(PrintDialogStatus::PrintStatusDisableAms);
+            }
+
             return;
         }
     }
@@ -3482,7 +3490,14 @@ void SelectMachineDialog::update_show_status()
             show_status(PrintDialogStatus::PrintStatusNeedUpgradingAms, params);
         } else {
             if (obj_->is_valid_mapping_result(m_ams_mapping_result)) {
-                show_status(PrintDialogStatus::PrintStatusAmsMappingByOrder);
+
+                if (has_timelapse_warning()) {
+                    show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
+                }
+                else {
+                    show_status(PrintDialogStatus::PrintStatusAmsMappingByOrder);
+                }
+                
             } else {
                 int mismatch_index = -1;
                 for (int i = 0; i < m_ams_mapping_result.size(); i++) {
@@ -3503,20 +3518,31 @@ void SelectMachineDialog::update_show_status()
     }
 
     if (m_ams_mapping_res) {
-        show_status(PrintDialogStatus::PrintStatusAmsMappingSuccess);
+        if (has_timelapse_warning()) {
+            show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
+        }
+        else {
+            show_status(PrintDialogStatus::PrintStatusAmsMappingSuccess);
+        }
         return;
     }
     else {
         if (obj_->is_valid_mapping_result(m_ams_mapping_result)) {
-            if (!has_tips(obj_))
-                show_status(PrintDialogStatus::PrintStatusAmsMappingValid);
-            return;
+            if (!has_tips(obj_)){
+                if (has_timelapse_warning()) {
+                    show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
+                }
+                else {
+                    show_status(PrintDialogStatus::PrintStatusAmsMappingValid);
+                }
+                return;
+            }       
         }
         else {
             show_status(PrintDialogStatus::PrintStatusAmsMappingInvalid);
             return;
         }
-    }
+    } 
 }
 
 bool SelectMachineDialog::has_timelapse_warning()