diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 39324602..9bfea0ed 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -144,6 +144,7 @@ on init
     chown system system /dev/logbuffer_rtx
     chown system system /dev/logbuffer_ssoc
     chown system system /dev/logbuffer_ttf
+    chown system system /dev/logbuffer_tcpm
     chown system system /dev/logbuffer_usbpd
     chown system system /dev/logbuffer_wireless
 
diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 81b573ed..e3654e27 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -337,11 +337,14 @@ void DumpstateDevice::dumpPowerSection(int fd) {
         DumpFileToFd(fd, "maxfg_flip", "/dev/logbuffer_maxfg_flip");
     }
 
-
-    if (!stat("/sys/kernel/debug/tcpm", &buffer)) {
-        RunCommandToFd(fd, "TCPM logs", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/tcpm/*"});
-    } else {
-        RunCommandToFd(fd, "TCPM logs", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/usb/tcpm*"});
+    if (!stat("/dev/logbuffer_tcpm", &buffer)) {
+        DumpFileToFd(fd, "Logbuffer TCPM", "/dev/logbuffer_tcpm");
+    } else if (!PropertiesHelper::IsUserBuild()) {
+        if (!stat("/sys/kernel/debug/tcpm", &buffer)) {
+            RunCommandToFd(fd, "TCPM logs", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/tcpm/*"});
+        } else {
+            RunCommandToFd(fd, "TCPM logs", {"/vendor/bin/sh", "-c", "cat /sys/kernel/debug/usb/tcpm*"});
+        }
     }
 
     DumpFileToFd(fd, "PD Engine", "/dev/logbuffer_usbpd");