diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
index 41230a94d62c1..02a5f08ed7ee9 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala
@@ -91,12 +91,13 @@ class Analyzer(
             val withAlias = u.alias.map(Subquery(_, relation))
             withAlias.getOrElse(relation)
           }
-          substituted.getOrElse(u)
-          i.copy(table = relation)
+          i.copy(table = substituted.getOrElse(u))
         case u : UnresolvedRelation =>
-          cteRelations.get(u.tableIdentifier.last)
-            .map(relation => u.alias.map(Subquery(_, relation)).getOrElse(relation))
-            .getOrElse(u)
+          val substituted = cteRelations.get(u.tableIdentifier.last).map { relation =>
+            val withAlias = u.alias.map(Subquery(_, relation))
+            withAlias.getOrElse(relation)
+          }
+          substituted.getOrElse(u)
       }
     }
   }