diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index fdad43ef6fa..ed0f1def181 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4210,11 +4210,11 @@ the remote host use line-endings as defined in the variable
       (when vec
 	(tramp-message vec 5 "Sentinel called: `%S' `%s'" proc event)
         (tramp-flush-connection-properties proc)
-        (tramp-flush-directory-properties vec "")
-        (with-current-buffer (tramp-get-buffer vec)
-          (goto-char (point-max))
-          (when (and prompt (re-search-backward (regexp-quote prompt) nil t))
-	    (delete-region (point) (point-max))))))))
+        (tramp-flush-directory-properties vec ""))
+      (with-current-buffer (process-buffer proc)
+        (goto-char (point-max))
+        (when (and prompt (re-search-backward (regexp-quote prompt) nil t))
+	  (delete-region (point) (point-max)))))))
 
 (defun tramp-get-inode (vec)
   "Returns the virtual inode number.