diff --git a/compiler/envanal.lisp b/compiler/envanal.lisp
index e21d840c629975d0fdfb478b23bd59638b30d086..1293c9fb1cba9ce4157d39e4fdf7db7822499df8 100644
--- a/compiler/envanal.lisp
+++ b/compiler/envanal.lisp
@@ -359,6 +359,8 @@
 	      (tails (lambda-tail-set fun)))
 	  (do-uses (use result)
 	    (when (and (immediately-used-p result use)
-		       (not (eq (node-derived-type use) *empty-type*)))
+		       (or (not (eq (node-derived-type use) *empty-type*))
+			   (not (basic-combination-p use))
+			   (eq (basic-combination-kind use) :local)))
 	      (setf (node-tail-p use) tails)))))))
   (undefined-value))