diff --git a/builder/main.py b/builder/main.py
index 85f60cc..6e47841 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -16,8 +16,9 @@ import re
 import sys
 from os.path import isfile, join
 
-from SCons.Script import (COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default,
-                          DefaultEnvironment)
+from SCons.Script import (
+    ARGUMENTS, COMMAND_LINE_TARGETS, AlwaysBuild, Builder, Default,
+    DefaultEnvironment)
 
 #
 # Helpers
@@ -328,6 +329,8 @@ elif upload_protocol == "esptool":
 elif upload_protocol in debug_tools:
     openocd_dir = platform.get_package_dir("tool-openocd-esp32") or ""
     uploader_flags = ["-s", _to_unix_slashes(openocd_dir)]
+    if not int(ARGUMENTS.get("PIOVERBOSE", 0)):
+        uploader_flags.extend(["--debug", "1"])
     uploader_flags.extend(
         debug_tools.get(upload_protocol).get("server").get("arguments", []))
     uploader_flags.extend(["-c", 'program_esp32 {{$SOURCE}} 0x10000 verify'])