diff --git a/power-supply/power_supply.cpp b/power-supply/power_supply.cpp
index 6ebf3a9..66d2d94 100644
--- a/power-supply/power_supply.cpp
+++ b/power-supply/power_supply.cpp
@@ -41,6 +41,10 @@
 using namespace sdbusplus::org::open_power::Witherspoon::Fault::Error;
 using namespace sdbusplus::xyz::openbmc_project::Common::Device::Error;
 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpessimizing-move"
+#endif
 PowerSupply::PowerSupply(const std::string& name, size_t inst,
                          const std::string& objpath, const std::string& invpath,
                          sdbusplus::bus_t& bus, const sdeventplus::Event& e,
@@ -98,6 +102,9 @@
     // Get initial power state.
     updatePowerState();
 }
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
 
 void PowerSupply::getAccessType()
 {
diff --git a/power-supply/record_manager.cpp b/power-supply/record_manager.cpp
index 7b34961..622b234 100644
--- a/power-supply/record_manager.cpp
+++ b/power-supply/record_manager.cpp
@@ -80,7 +80,13 @@
             }
         }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpessimizing-move"
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wpessimizing-move"
+#endif
         records.push_front(std::move(createRecord(rawRecord)));
+#pragma GCC diagnostic pop
 
         // If no more should be stored, prune the oldest
         if (records.size() > maxRecords)