diff --git a/CHANGES.rst b/CHANGES.rst
index 9887dd301..c17f9cc3b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,7 @@ Bug fixes in 0.5.0
 
 - Fixed a bug where using ``labgrid-client io get`` always returned ``low``
   when reading a ``sysfsgpio``.
+- Fix labgrid-client exit code on keyboard interrupt.
 
 Breaking changes in 0.5.0
 ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/labgrid/remote/client.py b/labgrid/remote/client.py
index f01beb126..3aec145eb 100755
--- a/labgrid/remote/client.py
+++ b/labgrid/remote/client.py
@@ -1904,7 +1904,7 @@ def main():
                 print(f"{parser.prog}: error: {e}", file=sys.stderr)
             exitcode = 1
         except KeyboardInterrupt:
-            exitcode = 0
+            exitcode = 1
         except Exception:  # pylint: disable=broad-except
             traceback.print_exc()
             exitcode = 2