diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 0389c46..00f6943 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -3283,7 +3283,11 @@
         Value variant = getDbusProperty(
             *dbus, service, boot_options::oneTimePath,
             boot_options::enabledIntf, boot_options::oneTimeBootEnableProp);
-        oneTimeEnabled = std::get_if<bool>(&variant);
+        auto pTmp = std::get_if<bool>(&variant);
+        if (pTmp != nullptr)
+        {
+            oneTimeEnabled = *pTmp;
+        }
 
         /*
          * Check if the current boot setting is onetime or permanent, if the
@@ -3299,6 +3303,7 @@
             setDbusProperty(*dbus, service, boot_options::oneTimePath,
                             boot_options::enabledIntf,
                             boot_options::oneTimeBootEnableProp, !permanent);
+            oneTimeEnabled = !permanent;
         }
 
         // set BootSource and BootMode properties