diff --git a/Cargo.lock b/Cargo.lock
index fcc295a44b6..ce4fed5cafc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -761,7 +761,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2594,7 +2594,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3025,7 +3025,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3779,7 +3779,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/packages/yew-macro/tests/html_macro/component-fail.stderr b/packages/yew-macro/tests/html_macro/component-fail.stderr
index 941e358d815..8f34088e4ee 100644
--- a/packages/yew-macro/tests/html_macro/component-fail.stderr
+++ b/packages/yew-macro/tests/html_macro/component-fail.stderr
@@ -488,14 +488,14 @@ error[E0277]: the trait bound `{integer}: IntoPropValue<String>` is not satisfie
    |                          required by a bound introduced by this call
    |
    = help: the following other types implement trait `IntoPropValue<T>`:
-             f32
-             f64
-             i128
-             i16
-             i32
-             i64
-             i8
-             isize
+             &f32
+             &f64
+             &i128
+             &i16
+             &i32
+             &i64
+             &i8
+             &isize
            and $N others
 note: required by a bound in `ChildPropertiesBuilder::string`
   --> tests/html_macro/component-fail.rs:4:17
@@ -516,14 +516,14 @@ error[E0277]: the trait bound `{integer}: IntoPropValue<String>` is not satisfie
    |                          required by a bound introduced by this call
    |
    = help: the following other types implement trait `IntoPropValue<T>`:
-             f32
-             f64
-             i128
-             i16
-             i32
-             i64
-             i8
-             isize
+             &f32
+             &f64
+             &i128
+             &i16
+             &i32
+             &i64
+             &i8
+             &isize
            and $N others
 note: required by a bound in `ChildPropertiesBuilder::string`
   --> tests/html_macro/component-fail.rs:4:17
@@ -560,9 +560,9 @@ error[E0277]: the trait bound `u32: IntoPropValue<i32>` is not satisfied
    |                    |
    |                    required by a bound introduced by this call
    |
-   = help: the trait `IntoPropValue<i32>` is not implemented for `u32`
-           but trait `IntoPropValue<VNode>` is implemented for it
-   = help: for that trait implementation, expected `VNode`, found `i32`
+   = help: the following other types implement trait `IntoPropValue<T>`:
+             &u32
+             u32
 note: required by a bound in `ChildPropertiesBuilder::int`
   --> tests/html_macro/component-fail.rs:4:17
    |
diff --git a/packages/yew-macro/tests/html_macro/element-fail.stderr b/packages/yew-macro/tests/html_macro/element-fail.stderr
index 0778bb33660..cd2a87bb422 100644
--- a/packages/yew-macro/tests/html_macro/element-fail.stderr
+++ b/packages/yew-macro/tests/html_macro/element-fail.stderr
@@ -465,14 +465,14 @@ error[E0277]: the trait bound `NotToString: IntoPropValue<Option<implicit_clone:
    |                            ^^^^^^^^^^^ the trait `IntoPropValue<Option<implicit_clone::unsync::string::IString>>` is not implemented for `NotToString`
    |
    = help: the following other types implement trait `IntoPropValue<T>`:
+             `&&String` implements `IntoPropValue<VNode>`
+             `&&str` implements `IntoPropValue<VNode>`
              `&'static [(K, V)]` implements `IntoPropValue<implicit_clone::unsync::map::IMap<K, V>>`
              `&'static [T]` implements `IntoPropValue<implicit_clone::unsync::array::IArray<T>>`
              `&'static str` implements `IntoPropValue<Classes>`
              `&'static str` implements `IntoPropValue<Option<String>>`
              `&'static str` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
              `&'static str` implements `IntoPropValue<String>`
-             `&'static str` implements `IntoPropValue<implicit_clone::unsync::string::IString>`
-             `&ChildrenRenderer<VNode>` implements `IntoPropValue<VNode>`
            and $N others
 
 error[E0277]: the trait bound `Option<NotToString>: IntoPropValue<Option<implicit_clone::unsync::string::IString>>` is not satisfied
@@ -491,8 +491,8 @@ error[E0277]: the trait bound `Option<NotToString>: IntoPropValue<Option<implici
              `Option<F>` implements `IntoPropValue<Option<yew::Callback<I, O>>>`
              `Option<Rc<str>>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
              `Option<String>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
+             `Option<T>` implements `IntoPropValue<VNode>`
              `Option<VChild<T>>` implements `IntoPropValue<Option<ChildrenRenderer<C>>>`
-             `Option<VNode>` implements `IntoPropValue<VNode>`
 
 error[E0277]: the trait bound `Option<{integer}>: IntoPropValue<Option<implicit_clone::unsync::string::IString>>` is not satisfied
   --> tests/html_macro/element-fail.rs:48:22
@@ -510,8 +510,8 @@ error[E0277]: the trait bound `Option<{integer}>: IntoPropValue<Option<implicit_
              `Option<F>` implements `IntoPropValue<Option<yew::Callback<I, O>>>`
              `Option<Rc<str>>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
              `Option<String>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
+             `Option<T>` implements `IntoPropValue<VNode>`
              `Option<VChild<T>>` implements `IntoPropValue<Option<ChildrenRenderer<C>>>`
-             `Option<VNode>` implements `IntoPropValue<VNode>`
 
 error[E0277]: the trait bound `{integer}: IntoEventCallback<MouseEvent>` is not satisfied
   --> tests/html_macro/element-fail.rs:51:28
@@ -627,8 +627,8 @@ error[E0277]: the trait bound `Option<yew::NodeRef>: IntoPropValue<yew::NodeRef>
              `Option<F>` implements `IntoPropValue<Option<yew::Callback<I, O>>>`
              `Option<Rc<str>>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
              `Option<String>` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
+             `Option<T>` implements `IntoPropValue<VNode>`
              `Option<VChild<T>>` implements `IntoPropValue<Option<ChildrenRenderer<C>>>`
-             `Option<VNode>` implements `IntoPropValue<VNode>`
 
 error[E0277]: the trait bound `yew::Callback<String>: IntoEventCallback<MouseEvent>` is not satisfied
   --> tests/html_macro/element-fail.rs:58:29
@@ -665,14 +665,14 @@ error[E0277]: the trait bound `NotToString: IntoPropValue<Option<implicit_clone:
    |                            ^^^^^^^^^^^ the trait `IntoPropValue<Option<implicit_clone::unsync::string::IString>>` is not implemented for `NotToString`
    |
    = help: the following other types implement trait `IntoPropValue<T>`:
+             `&&String` implements `IntoPropValue<VNode>`
+             `&&str` implements `IntoPropValue<VNode>`
              `&'static [(K, V)]` implements `IntoPropValue<implicit_clone::unsync::map::IMap<K, V>>`
              `&'static [T]` implements `IntoPropValue<implicit_clone::unsync::array::IArray<T>>`
              `&'static str` implements `IntoPropValue<Classes>`
              `&'static str` implements `IntoPropValue<Option<String>>`
              `&'static str` implements `IntoPropValue<Option<implicit_clone::unsync::string::IString>>`
              `&'static str` implements `IntoPropValue<String>`
-             `&'static str` implements `IntoPropValue<implicit_clone::unsync::string::IString>`
-             `&ChildrenRenderer<VNode>` implements `IntoPropValue<VNode>`
            and $N others
 
 error[E0277]: the trait bound `(): IntoPropValue<yew::NodeRef>` is not satisfied
diff --git a/packages/yew-macro/tests/html_macro/html-element-pass.rs b/packages/yew-macro/tests/html_macro/html-element-pass.rs
index 5c05322b050..5d1a1a4fe52 100644
--- a/packages/yew-macro/tests/html_macro/html-element-pass.rs
+++ b/packages/yew-macro/tests/html_macro/html-element-pass.rs
@@ -123,6 +123,26 @@ fn compile_pass() {
 
     let option_vnode = ::std::option::Option::Some(::yew::html! {});
     _ = ::yew::html! { <div>{option_vnode}</div> };
+
+    let opt_string: ::std::option::Option<::std::string::String> =
+        ::std::option::Option::Some(::std::convert::From::from("hello"));
+    _ = ::yew::html! { <div>{opt_string}</div> };
+
+    let opt_attr: ::std::option::Option<::yew::AttrValue> =
+        ::std::option::Option::Some(::yew::AttrValue::Static("hello"));
+    _ = ::yew::html! { <div>{opt_attr}</div> };
+
+    let opt_none: ::std::option::Option<::std::string::String> = ::std::option::Option::None;
+    _ = ::yew::html! { <div>{opt_none}</div> };
+
+    let num = 42i32;
+    _ = ::yew::html! { <div>{&num}</div> };
+
+    let text = ::std::string::String::new();
+    _ = ::yew::html! { <div>{&text}</div> };
+
+    let sr: &::core::primitive::str = "hello";
+    _ = ::yew::html! { <div>{&sr}</div> };
 }
 
 fn main() {}
diff --git a/packages/yew/src/html/conversion/into_prop_value.rs b/packages/yew/src/html/conversion/into_prop_value.rs
index 579660920dd..343ef2a28d4 100644
--- a/packages/yew/src/html/conversion/into_prop_value.rs
+++ b/packages/yew/src/html/conversion/into_prop_value.rs
@@ -214,10 +214,10 @@ impl IntoPropValue<VNode> for Vec<VNode> {
     }
 }
 
-impl IntoPropValue<VNode> for Option<VNode> {
+impl<T: IntoPropValue<VNode>> IntoPropValue<VNode> for Option<T> {
     #[inline]
     fn into_prop_value(self) -> VNode {
-        self.unwrap_or_default()
+        self.map(IntoPropValue::into_prop_value).unwrap_or_default()
     }
 }
 
@@ -292,6 +292,12 @@ macro_rules! impl_into_prop_value_via_display {
                 VText::from(self).into()
             }
         }
+        impl IntoPropValue<VNode> for &$from_ty {
+            #[inline(always)]
+            fn into_prop_value(self) -> VNode {
+                self.clone().into_prop_value()
+            }
+        }
     };
 }
 
@@ -350,6 +356,31 @@ mod test {
         let _: Option<AttrValue> = Cow::Borrowed("foo").into_prop_value();
     }
 
+    #[test]
+    fn test_option_to_vnode() {
+        let _: VNode = Some(String::from("hello")).into_prop_value();
+        let _: VNode = Some(AttrValue::Static("hello")).into_prop_value();
+        let _: VNode = Option::<String>::None.into_prop_value();
+        let _: VNode = Option::<AttrValue>::None.into_prop_value();
+        let _: VNode = Some(VNode::default()).into_prop_value();
+        let _: VNode = Option::<VNode>::None.into_prop_value();
+        let _: VNode = Some(42u32).into_prop_value();
+        let _: VNode = Some(true).into_prop_value();
+    }
+
+    #[test]
+    fn test_ref_to_vnode() {
+        let _: VNode = (&42i32).into_prop_value();
+        let _: VNode = (&true).into_prop_value();
+        let _: VNode = (&1.5f64).into_prop_value();
+        let s = String::from("hello");
+        let _: VNode = (&s).into_prop_value();
+        let a = AttrValue::Static("hello");
+        let _: VNode = (&a).into_prop_value();
+        let sr: &str = "hello";
+        let _: VNode = (&sr).into_prop_value();
+    }
+
     #[test]
     fn test_callback() {
         let _: Callback<String> = (|_: String| ()).into_prop_value();
diff --git a/website/docs/advanced-topics/children.mdx b/website/docs/advanced-topics/children.mdx
index 8966e1d95ff..868cab2692b 100644
--- a/website/docs/advanced-topics/children.mdx
+++ b/website/docs/advanced-topics/children.mdx
@@ -287,7 +287,7 @@ impl Component for Page {
     fn view(&self, ctx: &Context<Self>) -> Html {
         html! {
             <div class="page">
-                { ctx.props().sidebar.clone().map(Html::from).unwrap_or_default() }
+                { ctx.props().sidebar.clone() }
                 // ... page content
             </div>
         }