diff --git a/src/thread_list.cc b/src/thread_list.cc
index 186ddbc..ae74420 100644
--- a/src/thread_list.cc
+++ b/src/thread_list.cc
@@ -75,7 +75,11 @@
 static void DumpUnattachedThread(std::ostream& os, pid_t tid) {
   Thread::DumpState(os, NULL, tid);
   DumpKernelStack(os, tid, "  kernel: ", false);
-  DumpNativeStack(os, tid, "  native: ", false);
+  // TODO: Reenable this when the native code in system_server can handle it.
+  // Currently "adb shell kill -3 `pid system_server`" will cause it to exit.
+  if (false) {
+    DumpNativeStack(os, tid, "  native: ", false);
+  }
   os << "\n";
 }