diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py b/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py
index 038d35bee0..5e90e27f17 100644
--- a/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py
+++ b/plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py
@@ -77,6 +77,8 @@ class MachineInstance:
         for key, value in self._machine_setting_overrides.items():
             if key == "speed_support_lines": #Setting key was changed for 2.2.
                 key = "speed_support_infill"
+            if key == "retraction_combing": #Combing was made into an enum instead of a boolean.
+                value = "off" if (value == "False") else "all"
             config.set("machine_settings", key, str(value))
 
         output = io.StringIO()
diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py
index fe0a48f6d0..a70293f8b9 100644
--- a/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py
+++ b/plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py
@@ -96,6 +96,8 @@ class Profile:
             for key, value in self._settings.items():
                 if key == "speed_support_lines": #Setting key was changed for 2.2.
                     key = "speed_support_infill"
+                if key == "retraction_combing": #Combing was made into an enum instead of a boolean.
+                    value = "off" if (value == "False") else "all"
                 config.set("settings", key, str(value))
 
         if self._changed_settings_defaults:
@@ -103,6 +105,8 @@ class Profile:
             for key, value in self._changed_settings_defaults.items():
                 if key == "speed_support_lines": #Setting key was changed for 2.2.
                     key = "speed_support_infill"
+                if key == "retraction_combing": #Combing was made into an enum instead of a boolean.
+                    value = "off" if (value == "False") else "all"
                 config.set("defaults", key, str(value))
 
         if self._disabled_settings_defaults: