diff --git a/include/estoraged.hpp b/include/estoraged.hpp
index bf5e6c8..af709a2 100644
--- a/include/estoraged.hpp
+++ b/include/estoraged.hpp
@@ -111,7 +111,7 @@
     std::string mountPoint;
 
     /** @brief Indicates whether the LUKS device is currently locked. */
-    bool lockedProperty;
+    bool lockedProperty{false};
 
     /** @brief Pointer to cryptsetup interface object.
      *  @details This is used to mock out the cryptsetup functions.
@@ -139,7 +139,8 @@
     std::shared_ptr<sdbusplus::asio::dbus_interface> association;
 
     /** @brief Indicates whether the LUKS header is on the disk. */
-    Drive::DriveEncryptionState encryptionStatus;
+    Drive::DriveEncryptionState encryptionStatus{
+        Drive::DriveEncryptionState::Unknown};
 
     /** @brief Format LUKS encrypted device.
      *
diff --git a/src/estoraged.cpp b/src/estoraged.cpp
index 83c96c2..0063e44 100644
--- a/src/estoraged.cpp
+++ b/src/estoraged.cpp
@@ -40,9 +40,8 @@
                      std::unique_ptr<FilesystemInterface> fsInterface) :
     devPath(devPath),
     containerName(luksName), mountPoint("/mnt/" + luksName + "_fs"),
-    lockedProperty(false), cryptIface(std::move(cryptInterface)),
-    fsIface(std::move(fsInterface)), objectServer(server),
-    encryptionStatus(Drive::DriveEncryptionState::Unknown)
+    cryptIface(std::move(cryptInterface)), fsIface(std::move(fsInterface)),
+    objectServer(server)
 {
     /* Get the filename of the device (without "/dev/"). */
     std::string deviceName = std::filesystem::path(devPath).filename().string();