diff --git a/src/manufacturingcommands.cpp b/src/manufacturingcommands.cpp
index 865b3a1..fce6665 100644
--- a/src/manufacturingcommands.cpp
+++ b/src/manufacturingcommands.cpp
@@ -107,14 +107,13 @@
     }
 
     std::string ledName = ledProp->getName();
-    std::string ledService = ledServicePrefix + ledName;
     std::string ledPath = ledPathPrefix + ledName;
     ipmi::Value presentState;
 
     if (false == ledProp->getLock())
     {
-        if (mtm.getProperty(ledService.c_str(), ledPath.c_str(), ledIntf,
-                            "State", &presentState) != 0)
+        if (mtm.getProperty(ledService, ledPath.c_str(), ledIntf, "State",
+                            &presentState) != 0)
         {
             return IPMI_CC_UNSPECIFIED_ERROR;
         }
@@ -162,7 +161,6 @@
         else
         {
             std::string ledName = ledProp->getName();
-            std::string ledService = ledServicePrefix + ledName;
             std::string ledPath = ledPathPrefix + ledName;
             if (mtm.setProperty(ledService, ledPath, ledIntf, "State",
                                 ledProp->getPrevState()) != 0)
