diff --git a/packages/yew/src/html/component/scope.rs b/packages/yew/src/html/component/scope.rs
index c03752ae0e7..4f4e6eab1a1 100644
--- a/packages/yew/src/html/component/scope.rs
+++ b/packages/yew/src/html/component/scope.rs
@@ -392,12 +392,12 @@ mod feat_csr {
         ComponentRenderState, CreateRunner, DestroyRunner, RenderRunner,
     };
     use crate::html::{CompAnyRef, NodeRef};
-    use crate::{scheduler, ComponentRef};
+    use crate::scheduler;
     use std::cell::Ref;
     use web_sys::Element;
 
     pub(crate) struct ScopeHolder<COMP: BaseComponent> {
-        pub scope_ref: ComponentRef<COMP>,
+        pub scope_ref: CompAnyRef,
         pub scope: Scope<COMP>,
     }
 
@@ -484,7 +484,7 @@ mod feat_csr {
             self.scope.clone().into()
         }
         fn scope_ref(&self) -> CompAnyRef {
-            self.scope_ref.to_any()
+            self.scope_ref.clone()
         }
         fn render_state(&self) -> Option<Ref<'_, dyn fmt::Debug>> {
             let state_ref = self.scope.state.borrow();
diff --git a/packages/yew/src/html/mod.rs b/packages/yew/src/html/mod.rs
index 4a47c0538d3..fae98994e7f 100644
--- a/packages/yew/src/html/mod.rs
+++ b/packages/yew/src/html/mod.rs
@@ -172,6 +172,7 @@ mod feat_csr {
         }
     }
 
+    #[derive(Clone)]
     pub(crate) struct CompAnyRef(Rc<RefCell<CompRefInner>>);
 
     impl<COMP: BaseComponent> PartialEq<ComponentRef<COMP>> for CompAnyRef {
@@ -189,15 +190,18 @@ mod feat_csr {
     }
 
     impl<COMP: BaseComponent> ComponentRef<COMP> {
-        /// Place a scope in a reference for later use
-        pub(crate) fn set(&self, scope: Option<Scope<COMP>>) {
-            let mut this = self.0.borrow_mut();
-            this.scope = scope.map(|s| s.into());
-        }
         /// Convert to type erased, inner form
         pub(crate) fn to_any(&self) -> CompAnyRef {
             CompAnyRef(self.0.clone())
         }
+    }
+
+    impl CompAnyRef {
+        /// Place a scope in a reference for later use
+        pub(crate) fn set(&self, scope: Option<AnyScope>) {
+            let mut this = self.0.borrow_mut();
+            this.scope = scope;
+        }
         /// Re-use the old inner reference.
         /// MUST BE SURE THAT THE COMPONENT TYPES MATCH
         /// for example, by downcasting a Scope of the same type first
diff --git a/packages/yew/src/virtual_dom/vcomp.rs b/packages/yew/src/virtual_dom/vcomp.rs
index ad39f7990be..f06dcb91191 100644
--- a/packages/yew/src/virtual_dom/vcomp.rs
+++ b/packages/yew/src/virtual_dom/vcomp.rs
@@ -12,7 +12,7 @@ use crate::html::{AnyScope, Scope};
 #[cfg(feature = "csr")]
 use crate::dom_bundle::BSubtree;
 #[cfg(feature = "csr")]
-use crate::html::{NodeRef, Scoped};
+use crate::html::{CompAnyRef, NodeRef, Scoped};
 #[cfg(feature = "csr")]
 use web_sys::Element;
 
@@ -75,12 +75,15 @@ pub(crate) trait Mountable {
 
 pub(crate) struct PropsWrapper<COMP: BaseComponent> {
     props: Rc<COMP::Properties>,
-    comp_ref: ComponentRef<COMP>,
+    external_ref: CompAnyRef,
 }
 
 impl<COMP: BaseComponent> PropsWrapper<COMP> {
-    pub fn new(props: Rc<COMP::Properties>, comp_ref: ComponentRef<COMP>) -> Self {
-        Self { props, comp_ref }
+    pub fn new(props: Rc<COMP::Properties>, external_ref: ComponentRef<COMP>) -> Self {
+        Self {
+            props,
+            external_ref: external_ref.to_any(),
+        }
     }
 }
 
@@ -88,7 +91,7 @@ impl<COMP: BaseComponent> Mountable for PropsWrapper<COMP> {
     fn copy(&self) -> Box<dyn Mountable> {
         let wrapper: PropsWrapper<COMP> = PropsWrapper {
             props: Rc::clone(&self.props),
-            comp_ref: self.comp_ref.clone(),
+            external_ref: self.external_ref.clone(),
         };
         Box::new(wrapper)
     }
@@ -105,20 +108,20 @@ impl<COMP: BaseComponent> Mountable for PropsWrapper<COMP> {
         let scope: Scope<COMP> = Scope::new(Some(parent_scope.clone()));
 
         scope.mount_in_place(root.clone(), parent, next_sibling, internal_ref, self.props);
-        self.comp_ref.set(Some(scope.clone()));
+        self.external_ref.set(Some(scope.clone().into()));
 
         Box::new(crate::html::ScopeHolder {
             scope,
-            scope_ref: self.comp_ref,
+            scope_ref: self.external_ref,
         })
     }
 
     #[cfg(feature = "csr")]
     fn reuse(self: Box<Self>, scoped: &dyn Scoped, next_sibling: NodeRef) {
         let scope: Scope<COMP> = scoped.to_any().downcast::<COMP>();
-        self.comp_ref.reuse_any(&scoped.scope_ref());
+        self.external_ref.reuse_any(&scoped.scope_ref());
         scope.reuse(self.props, next_sibling);
-        self.comp_ref.set(Some(scope));
+        self.external_ref.set(Some(scope.into()));
     }
 
     #[cfg(feature = "ssr")]
@@ -136,7 +139,7 @@ impl<COMP: BaseComponent> Mountable for PropsWrapper<COMP> {
 
     #[cfg(all(test, feature = "csr"))]
     fn component_ref(&self) -> crate::html::CompAnyRef {
-        self.comp_ref.to_any()
+        self.external_ref.clone()
     }
 }