diff --git a/chassishandler.cpp b/chassishandler.cpp
index 9c0a97b..0ee593c 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -1446,6 +1446,14 @@
                     *data_len = 0;
                     return rc;
                 }
+                // If a set boot device is mapping to a boot source, then reset
+                // the boot mode D-Bus property to default.
+                // This way the ipmid code can determine which property is not
+                // at the default value
+                if(sourceItr->second != Source::Sources::Default)
+                {
+                    setBootMode(Mode::Modes::Regular);
+                }
             }
             if (modeIpmiToDbus.end() != modeItr)
             {
@@ -1455,6 +1463,14 @@
                     *data_len = 0;
                     return rc;
                 }
+                // If a set boot device is mapping to a boot mode, then reset
+                // the boot source D-Bus property to default.
+                // This way the ipmid code can determine which property is not
+                // at the default value
+                if(modeItr->second != Mode::Modes::Regular)
+                {
+                    setBootSource(Source::Sources::Default);
+                }
             }
         }
         catch (InternalFailure& e)