diff --git a/lua/jj/ui/editor.lua b/lua/jj/ui/editor.lua
index 08d1336..475d797 100644
--- a/lua/jj/ui/editor.lua
+++ b/lua/jj/ui/editor.lua
@@ -155,9 +155,7 @@ function M.open_editor(initial_text, on_write, on_unload, keymaps)
 			buffer = buf,
 			callback = function()
 				local last_written = vim.b[buf].jj_last_written_lines
-				if last_written then
-					on_unload(last_written)
-				end
+				on_unload(last_written)
 			end,
 		})
 	end
diff --git a/lua/jj/ui/terminal.lua b/lua/jj/ui/terminal.lua
index cb5f310..8722bb9 100644
--- a/lua/jj/ui/terminal.lua
+++ b/lua/jj/ui/terminal.lua
@@ -148,7 +148,6 @@ function M.close_terminal_buffer()
 	-- Otherwise close the buffer
 	buffer.close(state.buf)
 	state.buf_cmd = nil
-	state.cursor_restore_pos = nil
 	state.chan = nil
 	state.job_id = nil
 end