diff --git a/bin/cbuildbot.py b/bin/cbuildbot.py
index c75e467cc7..2e86ae4173 100755
--- a/bin/cbuildbot.py
+++ b/bin/cbuildbot.py
@@ -701,8 +701,9 @@ def main():
       if buildconfig['master']:
         # Master bot needs to check if the other slaves completed.
         if cbuildbot_comm.HaveSlavesCompleted(config):
-          _UploadPrebuilts(buildroot, board, buildconfig['rev_overlays'],
-                           [new_binhost])
+          if not options.debug:
+            _UploadPrebuilts(buildroot, board, buildconfig['rev_overlays'],
+                             [new_binhost])
           _UprevPush(buildroot, tracking_branch, buildconfig['board'],
                      push_overlays, options.debug)
         else: