diff --git a/subiquity/cmd/server.py b/subiquity/cmd/server.py
index 49ff8ac0..8e4bd546 100644
--- a/subiquity/cmd/server.py
+++ b/subiquity/cmd/server.py
@@ -193,6 +193,7 @@ def main():
 
     logfiles = setup_logger(dir=logdir, base="subiquity-server")
 
+    logging.captureWarnings(True)
     logger = logging.getLogger("subiquity")
     revision = os.environ.get("SNAP_REVISION", "unknown")
     version = os.environ.get("SNAP_VERSION", "unknown")
diff --git a/subiquity/cmd/tui.py b/subiquity/cmd/tui.py
index b6933bf8..740d69aa 100755
--- a/subiquity/cmd/tui.py
+++ b/subiquity/cmd/tui.py
@@ -124,6 +124,7 @@ def main():
         logdir = opts.output_base
     logfiles = setup_logger(dir=logdir, base="subiquity-client")
 
+    logging.captureWarnings(True)
     logger = logging.getLogger("subiquity")
     version = os.environ.get("SNAP_REVISION", "unknown")
     snap = os.environ.get("SNAP", "unknown")