diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 89e8f20..fd02840 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -9958,6 +9958,12 @@ exports[`App Route /vehicle-status authenticated 1`] = `
                             : 
                             3
                           </p>
+                          <p>
+                            <b>
+                              Debug Mask
+                            </b>
+                            : 
+                          </p>
                         </div>
                         <div
                           class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
diff --git a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
index f8ee4b8..267a4d4 100644
--- a/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
+++ b/src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
@@ -136,6 +136,12 @@ exports[`VehicleDetailsTab Render 1`] = `
                   : 
                   3
                 </p>
+                <p>
+                  <b>
+                    Debug Mask
+                  </b>
+                  : 
+                </p>
               </div>
               <div
                 class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
diff --git a/src/components/Cars/Status/Details/index.jsx b/src/components/Cars/Status/Details/index.jsx
index 3294a80..0679934 100644
--- a/src/components/Cars/Status/Details/index.jsx
+++ b/src/components/Cars/Status/Details/index.jsx
@@ -118,6 +118,9 @@ const MainForm = ({ vin }) => {
             <p>
               <b>Filters</b>: {vehicle.canbus.filters ? vehicle.canbus.filters.length : 0}
             </p>
+            <p>
+              <b>Debug Mask</b>: {vehicle.debug_mask}
+            </p>
           </Grid>
         )}
         <Grid item md={12} className={classes.textCenterAlign}>
diff --git a/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap b/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
index 08c875a..1975ba7 100644
--- a/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
+++ b/src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
@@ -144,6 +144,12 @@ exports[`DetailsTab Render 1`] = `
                     : 
                     3
                   </p>
+                  <p>
+                    <b>
+                      Debug Mask
+                    </b>
+                    : 
+                  </p>
                 </div>
                 <div
                   class="MuiGrid-root makeStyles-textCenterAlign-0 MuiGrid-item MuiGrid-grid-md-12"
diff --git a/src/components/Cars/Update/__snapshots__/index.test.jsx.snap b/src/components/Cars/Update/__snapshots__/index.test.jsx.snap
index b30ce30..a75b838 100644
--- a/src/components/Cars/Update/__snapshots__/index.test.jsx.snap
+++ b/src/components/Cars/Update/__snapshots__/index.test.jsx.snap
@@ -931,6 +931,42 @@ exports[`VehicleUpdate Render 1`] = `
                   </fieldset>
                 </div>
               </div>
+              <div
+                class="MuiFormControl-root MuiTextField-root MuiFormControl-marginNormal MuiFormControl-fullWidth"
+              >
+                <label
+                  class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-outlined MuiFormLabel-filled"
+                  data-shrink="true"
+                  for="debug_mask"
+                  id="debug_mask-label"
+                >
+                  Debug Mask
+                </label>
+                <div
+                  class="MuiInputBase-root MuiOutlinedInput-root MuiInputBase-fullWidth MuiInputBase-formControl"
+                >
+                  <input
+                    aria-invalid="false"
+                    class="MuiInputBase-input MuiOutlinedInput-input"
+                    id="debug_mask"
+                    name="debug_mask"
+                    type="number"
+                    value="0"
+                  />
+                  <fieldset
+                    aria-hidden="true"
+                    class="PrivateNotchedOutline-root-0 MuiOutlinedInput-notchedOutline"
+                  >
+                    <legend
+                      class="PrivateNotchedOutline-legendLabelled-0 PrivateNotchedOutline-legendNotched-0"
+                    >
+                      <span>
+                        Debug Mask
+                      </span>
+                    </legend>
+                  </fieldset>
+                </div>
+              </div>
               <button
                 class="MuiButtonBase-root MuiButton-root MuiButton-contained makeStyles-submit-0 MuiButton-containedPrimary MuiButton-fullWidth"
                 tabindex="0"
diff --git a/src/components/Cars/Update/index.jsx b/src/components/Cars/Update/index.jsx
index 71132a4..510531f 100644
--- a/src/components/Cars/Update/index.jsx
+++ b/src/components/Cars/Update/index.jsx
@@ -46,6 +46,7 @@ const MainForm = () => {
   const [dataLoggerEnabled, setDataLoggerEnabled] = useState(false);
   const [maxMemBufferSize, setMaxMemBufferSize] = useState(0);
   const [maxDiskBufferSize, setMaxDiskBufferSize] = useState(0);
+  const [debugMask, setDebugMask] = useState(0);
 
   useEffect(() => {
     setTitle("Update Vehicle");
@@ -93,6 +94,9 @@ const MainForm = () => {
       setMaxMemBufferSize(vehicle.canbus.max_mem_buffer_size ?? maxMemBufferSize);
       setMaxDiskBufferSize(vehicle.canbus.max_disk_buffer_size ?? maxDiskBufferSize);
     }
+
+    setDebugMask(vehicle.debug_mask ?? debugMask);
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [vehicle]);
 
@@ -116,6 +120,10 @@ const MainForm = () => {
     setMaxDiskBufferSize(event.target.value);
   }
 
+  const onDebugMaskChange = (event) => {
+    setDebugMask(event.target.value);
+  }
+
   const onSubmit = async (event) => {
     try {
       event.preventDefault();
@@ -136,7 +144,8 @@ const MainForm = () => {
           data_logger_enabled: canbusEnabled ? dataLoggerEnabled : false,
           max_mem_buffer_size: canbusEnabled ? parseInt(maxMemBufferSize) : 0,
           max_disk_buffer_size: canbusEnabled && dataLoggerEnabled ? parseInt(maxDiskBufferSize) : 0
-        }
+        },
+        debug_mask: parseInt(debugMask)
       };
 
       const result = await updateVehicle(vin, formData, token);
@@ -379,6 +388,17 @@ const MainForm = () => {
           required
           fullWidth
         />
+        <TextField
+          id="debug_mask"
+          name="debug_mask"
+          label='Debug Mask'
+          value={debugMask}
+          onChange={onDebugMaskChange}
+          variant="outlined"
+          margin="normal"
+          type="number"
+          fullWidth
+        />
         <Button
           type="submit"
           disabled={busy}