diff --git a/qrexec/qrexec-client.c b/qrexec/qrexec-client.c
index 8ceeffd..d3a4560 100644
--- a/qrexec/qrexec-client.c
+++ b/qrexec/qrexec-client.c
@@ -374,10 +374,7 @@ static void handle_vchan_data(libvchan_t *vchan)
         case MSG_DATA_EXIT_CODE:
             libvchan_close(vchan);
             status = *(unsigned int *) buf;
-            if (WIFEXITED(status))
-                do_exit(WEXITSTATUS(status));
-            else
-                do_exit(255);
+            do_exit(status);
             break;
         default:
             fprintf(stderr, "unknown msg %d\n", hdr.type);