diff --git a/src/cdk/tree/tree.spec.ts b/src/cdk/tree/tree.spec.ts
index d76b9e622cf8..c7d6b17db38f 100644
--- a/src/cdk/tree/tree.spec.ts
+++ b/src/cdk/tree/tree.spec.ts
@@ -607,6 +607,8 @@ describe('CdkTree', () => {
           flush();
         } catch {
           flush();
+        } finally {
+          flush();
         }
       }).toThrowError(getTreeControlFunctionsMissingError().message);
     }));
diff --git a/src/cdk/tree/tree.ts b/src/cdk/tree/tree.ts
index dce98c43ee79..5f539db340d2 100644
--- a/src/cdk/tree/tree.ts
+++ b/src/cdk/tree/tree.ts
@@ -287,6 +287,8 @@ export class CdkTree<T> implements CollectionViewer, OnInit, OnDestroy {
           viewContainer.move(view!, currentIndex);
         }
       });
+
+    this._changeDetectorRef.detectChanges();
   }
 
   /**
@@ -336,7 +338,5 @@ export class CdkTree<T> implements CollectionViewer, OnInit, OnDestroy {
     if (CdkTreeNode.mostRecentTreeNode) {
       CdkTreeNode.mostRecentTreeNode.data = nodeData;
     }
-
-    this._changeDetectorRef.detectChanges();
   }
 }