diff --git a/groundStation/src/frontend/frontend_common.c b/groundStation/src/frontend/frontend_common.c
index 7da484f0b120e9a888bad0dc57c0b4093aba1141..2492822acea6626bf7b4402f3246267444eff463 100644
--- a/groundStation/src/frontend/frontend_common.c
+++ b/groundStation/src/frontend/frontend_common.c
@@ -56,6 +56,9 @@ struct backend_conn * ucart_backendConnect()
 		perror("fdopen");
 		goto fail_malloc_conn;
 	}
+	if (setbuf(conn->socket, NULL, _IONBF)) {
+		warn("setbuf");
+	}
 
 	/* success */
 	goto fail_final;