diff --git a/src/text.c b/src/text.c
index 85d1bd40..0db4be1b 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1177,7 +1177,8 @@ void update_undo(undo_type action)
 		else if (cutbuffer != NULL) {
 			free_lines(u->cutbuffer);
 			u->cutbuffer = copy_buffer(cutbuffer);
-		}
+		} else
+			break;
 		if (!(u->xflags & MARK_WAS_SET)) {
 			linestruct *bottomline = u->cutbuffer;
 			size_t count = 0;