diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c
index d163f0894..aeb9b74d1 100644
--- a/src/detection/battery/battery_android.c
+++ b/src/detection/battery/battery_android.c
@@ -7,6 +7,13 @@
 #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
 #define FF_TERMUX_API_PARAM "BatteryStatus"
 
+static inline void wrapYyjsonFree(yyjson_doc** doc)
+{
+    assert(doc);
+    if (*doc)
+        yyjson_doc_free(*doc);
+}
+
 const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
 {
     FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
@@ -18,8 +25,13 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
     }))
         return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed";
 
-    if(buffer.chars[0] != '{')
-        return "`" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` prints invalid result (not a JSON object)";
+    yyjson_doc* __attribute__((__cleanup__(wrapYyjsonFree))) doc = yyjson_read_opts(buffer.chars, buffer.length, 0, NULL, NULL);
+    if (!doc)
+        return "Failed to parse battery info";
+
+    yyjson_val* root = yyjson_doc_get_root(doc);
+    if (!yyjson_is_obj(root))
+        return "Battery info result is not a JSON object";
 
     BatteryResult* battery = ffListAdd(results);
     battery->temperature = FF_BATTERY_TEMP_UNSET;
@@ -28,28 +40,10 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
     ffStrbufInit(&battery->status);
     ffStrbufInit(&battery->technology);
 
-    if(ffParsePropLines(buffer.chars, "\"percentage\": ", &battery->status))
-    {
-        battery->capacity = ffStrbufToDouble(&battery->status);
-        ffStrbufClear(&battery->status);
-    }
-
+    battery->capacity = yyjson_get_num(yyjson_obj_get(root, "percentage"));
+    ffStrbufAppendS(&battery->status, yyjson_get_str(yyjson_obj_get(root, "status")));
     if(options->temp)
-    {
-        if(ffParsePropLines(buffer.chars, "\"temperature\": ", &battery->status))
-        {
-            ffStrbufTrimRight(&battery->status, ',');
-            ffStrbufTrim(&battery->status, '"');
-            battery->temperature = ffStrbufToDouble(&battery->status);
-            ffStrbufClear(&battery->status);
-        }
-    }
-
-    if(ffParsePropLines(buffer.chars, "\"status\": ", &battery->status))
-    {
-        ffStrbufTrimRight(&battery->status, ',');
-        ffStrbufTrim(&battery->status, '"');
-    }
+        battery->temperature = yyjson_get_num(yyjson_obj_get(root, "temperature"));
 
     return NULL;
 }