diff --git a/degesch.c b/degesch.c
index 2e6e436..079e750 100644
--- a/degesch.c
+++ b/degesch.c
@@ -396,8 +396,9 @@ input_destroy_buffer (struct input *self, struct input_buffer *buffer)
 		HISTORY_STATE *state = history_get_history_state ();
 
 		history_set_history_state (buffer->history);
-		free (buffer->history);
 		rl_clear_history ();
+		free (buffer->history);
+		buffer->history = NULL;
 
 		history_set_history_state (state);
 		free (state);