diff --git a/src/fru_utils.cpp b/src/fru_utils.cpp
index f39bbac..c4b46cf 100644
--- a/src/fru_utils.cpp
+++ b/src/fru_utils.cpp
@@ -525,9 +525,11 @@
 
             if (state == DecodeState::ok)
             {
-                // Strip non null characters from the end
+                // Strip non null characters and trailing spaces from the end
                 value.erase(std::find_if(value.rbegin(), value.rend(),
-                                         [](char ch) { return ch != 0; })
+                                         [](char ch) {
+                                             return ((ch != 0) && (ch != ' '));
+                                         })
                                 .base(),
                             value.end());