diff --git a/extensions/openpower-pels/data_interface.cpp b/extensions/openpower-pels/data_interface.cpp
index 1deaac8..1477806 100644
--- a/extensions/openpower-pels/data_interface.cpp
+++ b/extensions/openpower-pels/data_interface.cpp
@@ -342,7 +342,9 @@
 {
     static const std::string locationCodePrefix{"Ufcs-"};
 
-    if (locationCode.find(locationCodePrefix) == std::string::npos)
+    // Technically there are 2 location code prefixes, Ufcs and Umts, so
+    // if it already starts with a U then don't need to do anything.
+    if (locationCode.front() != 'U')
     {
         return locationCodePrefix + locationCode;
     }
diff --git a/extensions/openpower-pels/data_interface.hpp b/extensions/openpower-pels/data_interface.hpp
index 4883338..944de05 100644
--- a/extensions/openpower-pels/data_interface.hpp
+++ b/extensions/openpower-pels/data_interface.hpp
@@ -551,9 +551,10 @@
     }
 
     /**
-     * @brief Adds the Ufcs- prefix to the location code passed in.
+     * @brief Adds the Ufcs- prefix to the location code passed in
+     *        if necessary.
      *
-     * Necessary because the location codes that come back from the
+     * Needed because the location codes that come back from the
      * message registry and device callout JSON don't have it.
      *
      * @param[in] - The location code without a prefix, like P1-C1