diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp
index f4f2bac8..527745bb 100644
--- a/app/src/main/cpp/PhoneDevice.cpp
+++ b/app/src/main/cpp/PhoneDevice.cpp
@@ -369,7 +369,7 @@ bool CPhoneDevice::QuerySystemProperties(std::map<std::string, std::string>& pro
             __system_property_get("ro.build.date.utc", value);
             it->second = value;
         }
-        else if (it->first == PROP_SN)
+        else if (it->first == PROP_SN || it->first == PROP_BS_ID)
         {
             __system_property_get("ro.serialno", value);
             it->second = value;
@@ -383,10 +383,6 @@ bool CPhoneDevice::QuerySystemProperties(std::map<std::string, std::string>& pro
         {
             it->second = QueryCpuTemperature();
         }
-        else if (it->first == PROP_BS_ID)
-        {
-            it->second = "SHXY";
-        }
         else if (it->first == PROP_FREE_ROM)
         {
             fs::space_info si = fs::space("/data");