diff --git a/src/tnc.c b/src/tnc.c
index fc909f5..ab0c3a3 100644
--- a/src/tnc.c
+++ b/src/tnc.c
@@ -278,7 +278,8 @@ ssize_t patty_kiss_tnc_drain(patty_kiss_tnc *tnc, void *buf, size_t len) {
                 if (c == PATTY_KISS_FESC) {
                     tnc->state = KISS_FRAME_ESCAPE;
                 } else if (c == PATTY_KISS_FEND) {
-                    tnc->state = KISS_FRAME_COMMAND;
+                    tnc->state   = KISS_FRAME_COMMAND;
+                    tnc->command = PATTY_KISS_RETURN;
 
                     goto done;
                 } else {