diff --git a/src/app/containers/Preferences/Preferences.jsx b/src/app/containers/Preferences/Preferences.jsx
index 7604033e0..a0b7ee3ce 100644
--- a/src/app/containers/Preferences/Preferences.jsx
+++ b/src/app/containers/Preferences/Preferences.jsx
@@ -182,7 +182,6 @@ class PreferencesPage extends PureComponent {
             shouldWarnZero: store.get('workspace.shouldWarnZero', false),
             ipRange: store.get('widgets.connection.ip', [192, 168, 5, 1]),
             toolChange: {
-                passthrough: store.get('workspace.toolChange.passthrough', false),
                 skipDialog: store.get('workspace.toolChange.skipDialog', false)
             },
             rotary: {
@@ -750,15 +749,6 @@ class PreferencesPage extends PureComponent {
             }
         },
         toolChange: {
-            handlePassthroughToggle: () => {
-                const { toolChange } = this.state;
-                this.setState({
-                    toolChange: {
-                        ...toolChange,
-                        passthrough: !toolChange.passthrough
-                    }
-                });
-            },
             handleSkipDialog: () => {
                 const { toolChange } = this.state;
                 this.setState({
@@ -897,7 +887,6 @@ class PreferencesPage extends PureComponent {
         this.probeConfig.set('probeFastFeedrate', probeSettings.fastFeedrate);
         this.probeConfig.set('connectivityTest', probeSettings.connectivityTest);
         this.probeConfig.set('zProbeDistance', probeSettings.zProbeDistance);
-        store.set('workspace.toolChange.passthrough', toolChange.passthrough);
         store.set('workspace.toolChange.skipDialog', toolChange.skipDialog);
 
         controller.command('settings:updated', this.state);
diff --git a/src/app/containers/Preferences/ToolChange/ToolChange.js b/src/app/containers/Preferences/ToolChange/ToolChange.js
index a32fb36bc..c2c586fab 100644
--- a/src/app/containers/Preferences/ToolChange/ToolChange.js
+++ b/src/app/containers/Preferences/ToolChange/ToolChange.js
@@ -51,6 +51,11 @@ export const TOOLCHANGE_OPTIONS = {
         key: 'CODE',
         label: 'Code',
         description: 'Run code before and after the toolchange.'
+    },
+    PASSTHROUGH: {
+        key: 'PASSTHROUGH',
+        label: 'Passthrough',
+        description: 'Send the toolchange line as is. This assumes that your firmware can properly handle both M6 and T commands.'
     }
 };
 
@@ -67,7 +72,7 @@ const ToolChange = ({ state, actions, mpos, $13 }) => {
     // State
     const [toolChangeOption, setToolChangeOption] = useState(store.get('workspace.toolChangeOption'));
     const [toolChangePosition, setToolChangePosition] = useState($13 ? convertToolChangePosition() : store.get('workspace.toolChangePosition'));
-    const [optionDescription, setOptionDescription] = useState('');
+    const [optionDescription, setOptionDescription] = useState(TOOLCHANGE_OPTIONS[toolChangeOption.toUpperCase()]?.description);
     const [preHook, setPreHook] = useState(store.get('workspace.toolChangeHooks.preHook'));
     const [postHook, setPostHook] = useState(store.get('workspace.toolChangeHooks.postHook'));
     //const [combineBlocks, setCombineBlocks] = useState(false);
@@ -152,30 +157,7 @@ const ToolChange = ({ state, actions, mpos, $13 }) => {
     return (
         <div style={{ width: '70%' }}>
             <Fieldset legend="Tool Change" className={styles.paddingBottom}>
-                {
-                    toolChangeOption !== 'Code' && (
-                        <TooltipCustom content="Send the toolchange line as is. This assumes that your firmware can properly handle both M6 and T commands." location="default">
-                            <ToggleSwitch
-                                label="Passthrough"
-                                checked={state.toolChange.passthrough}
-                                onChange={actions.toolChange.handlePassthroughToggle}
-                                style={{ marginBottom: '1rem' }}
-                            />
-                        </TooltipCustom>
-                    )
-                }
-                {
-                    toolChangeOption === 'Code' && (
-                        <TooltipCustom content="Combine the blocks and avoid dialogs on tool changes - useful for ATC configurations" location="default">
-                            <ToggleSwitch
-                                label="Skip Dialog"
-                                checked={state.toolChange.skipDialog}
-                                onChange={actions.toolChange.handleSkipDialog}
-                                style={{ marginBottom: '1rem' }}
-                            />
-                        </TooltipCustom>
-                    )
-                }
+
                 <small>Strategy to handle M6 tool change commands</small>
                 <div className={styles.addMargin}>
                     <Select
@@ -194,6 +176,19 @@ const ToolChange = ({ state, actions, mpos, $13 }) => {
                     <p className={styles.description}>{optionDescription}</p>
                 </div>
                 {
+                    toolChangeOption === 'Code' && (
+                        <TooltipCustom content="Combine the blocks and avoid dialogs on tool changes - useful for ATC configurations" location="default">
+                            <ToggleSwitch
+                                label="Skip Dialog"
+                                checked={state.toolChange.skipDialog}
+                                onChange={actions.toolChange.handleSkipDialog}
+                                style={{ marginBottom: '1rem' }}
+                            />
+                        </TooltipCustom>
+                    )
+                }
+                {
+
                     toolChangeOption === 'Fixed Tool Sensor' && (
                         <div>
                             <Input
@@ -225,7 +220,7 @@ const ToolChange = ({ state, actions, mpos, $13 }) => {
                     toolChangeOption === 'Code' && (
                         <div>
                             <div className={styles.spreadRow}>
-                                <MacroVariableDropdown textarea={preHookRef} label="Before change code"/>
+                                <MacroVariableDropdown textarea={preHookRef} label="Before change code" />
                             </div>
                             <textarea
                                 rows="6"
@@ -237,7 +232,7 @@ const ToolChange = ({ state, actions, mpos, $13 }) => {
                                 ref={preHookRef}
                             />
                             <div className={styles.spreadRow} style={{ marginTop: '10px' }}>
-                                <MacroVariableDropdown textarea={postHookRef} label="After change code"/>
+                                <MacroVariableDropdown textarea={postHookRef} label="After change code" />
                             </div>
                             <textarea
                                 rows="6"
diff --git a/src/app/store/defaultState.js b/src/app/store/defaultState.js
index 0913913d7..6c64cbe62 100644
--- a/src/app/store/defaultState.js
+++ b/src/app/store/defaultState.js
@@ -54,7 +54,6 @@ const defaultState = {
         longestTimeRun: 0,
         jobTimes: [],
         toolChange: {
-            passthrough: false,
             skipDialog: false,
         },
         toolChangeOption: 'Ignore',
diff --git a/src/server/controllers/Grbl/GrblController.js b/src/server/controllers/Grbl/GrblController.js
index 22e3d5106..d581f8c2e 100644
--- a/src/server/controllers/Grbl/GrblController.js
+++ b/src/server/controllers/Grbl/GrblController.js
@@ -346,16 +346,14 @@ class GrblController {
                 }
 
                 // // M6 Tool Change
-                //const passthroughM6 = store.get('preferences.toolChange.passthrough', false);
-                const passthroughM6 = _.get(this.toolChangeContext, 'passthrough', false);
                 if (_.includes(words, 'M6')) {
-                    log.debug('M6 Tool Change');
-                    this.feeder.hold({
-                        data: 'M6',
-                        comment: commentString
-                    }); // Hold reason
-
-                    if (!passthroughM6) {
+                    const { toolChangeOption } = this.toolChangeContext;
+                    if (toolChangeOption !== 'Passthrough') {
+                        log.debug('M6 Tool Change');
+                        this.feeder.hold({
+                            data: 'M6',
+                            comment: commentString
+                        }); // Hold reason
                         line = line.replace('M6', '(M6)');
                     }
                 }
@@ -473,7 +471,8 @@ class GrblController {
                 }
 
                 /* Emit event to UI for toolchange handler */
-                if (_.includes(words, 'M6')) {
+                const { toolChangeOption } = this.toolChangeContext;
+                if (_.includes(words, 'M6') && toolChangeOption !== 'Passthrough') {
                     log.debug(`M6 Tool Change: line=${sent + 1}, sent=${sent}, received=${received}`);
 
                     // No toolchange in check mode
@@ -482,8 +481,6 @@ class GrblController {
                         return line.replace('M6', '(M6)');
                     }
 
-                    const { toolChangeOption } = this.toolChangeContext;
-
                     let tool = line.match(toolCommand);
 
                     // Handle specific cases for macro and pause, ignore is default and comments line out with no other action
@@ -514,11 +511,8 @@ class GrblController {
                         }
                     }
 
-                    //const passthroughM6 = store.get('preferences.toolChange.passthrough', false);
-                    const passthroughM6 = _.get(this.toolChangeContext, 'passthrough', false);
-                    if (!passthroughM6) {
-                        line = line.replace('M6', '(M6)');
-                    }
+                    line = line.replace('M6', '(M6)');
+
                     //line = line.replace(`${tool?.[0]}`, `(${tool?.[0]})`);
                 }
 
@@ -1759,7 +1753,7 @@ class GrblController {
             // @param {number} value The amount of percentage increase or decrease.
             'spindleOverride': () => {
                 const [value] = args;
-                const [,, spindleOV] = this.state.status.ov;
+                const [, , spindleOV] = this.state.status.ov;
 
                 let diff = value - spindleOV;
                 //Limits for keyboard/gamepad shortcuts
diff --git a/src/server/controllers/Grblhal/GrblHalController.js b/src/server/controllers/Grblhal/GrblHalController.js
index 3de016407..a75c0c233 100644
--- a/src/server/controllers/Grblhal/GrblHalController.js
+++ b/src/server/controllers/Grblhal/GrblHalController.js
@@ -342,13 +342,20 @@ class GrblHalController {
                     this.updateSpindleModal(spindleCommand);
                 }
 
-                // // M6 Tool Change
+                // M6 Tool Change
                 if (_.includes(words, 'M6')) {
-                    log.debug('M6 Tool Change');
-                    this.feeder.hold({ data: 'M6', comment: commentString }); // Hold reason
-                    line = line.replace('M6', '(M6)');
+                    const { toolChangeOption } = this.toolChangeContext;
+                    if (toolChangeOption !== 'Passthrough') {
+                        log.debug('M6 Tool Change');
+                        this.feeder.hold({
+                            data: 'M6',
+                            comment: commentString
+                        }); // Hold reason
+                        line = line.replace('M6', '(M6)');
+                    }
                 }
 
+
                 if (this.isInRotaryMode) {
                     const containsACommand = A_AXIS_COMMANDS.test(line);
                     const containsYCommand = Y_AXIS_COMMANDS.test(line);
@@ -463,9 +470,9 @@ class GrblHalController {
                 }
 
                 /* Emit event to UI for toolchange handler */
-                if (_.includes(words, 'M6')) {
+                const { toolChangeOption } = this.toolChangeContext;
+                if (_.includes(words, 'M6') && toolChangeOption !== 'Passthrough') {
                     log.debug(`M6 Tool Change: line=${sent + 1}, sent=${sent}, received=${received}`);
-                    const { toolChangeOption } = this.toolChangeContext;
 
                     const currentState = _.get(this.state, 'status.activeState', '');
                     if (currentState === 'Check') {
@@ -504,10 +511,7 @@ class GrblHalController {
                         }
                     }
 
-                    const passthroughM6 = _.get(this.toolChangeContext, 'passthrough', false);
-                    if (!passthroughM6 || toolChangeOption === 'Code') {
-                        line = line.replace('M6', '(M6)');
-                    }
+                    line = line.replace('M6', '(M6)');
                     //line = line.replace(`${tool?.[0]}`, `(${tool?.[0]})`);
                 }