diff --git a/AK/Optional.h b/AK/Optional.h
index 1bb6441bcb..7519072a8a 100644
--- a/AK/Optional.h
+++ b/AK/Optional.h
@@ -446,16 +446,22 @@ public:
         return *this;
     }
 
-    // Note: Disallows assignment from a temporary as this does not do any lifetime extension.
     template<typename U>
     requires(!IsSame<OptionalNone, RemoveCVReference<U>>)
-    ALWAYS_INLINE Optional& operator=(U&& value)
-    requires(CanBePlacedInOptional<U> && IsLvalueReference<U>)
+    ALWAYS_INLINE Optional& operator=(U& value)
+    requires(CanBePlacedInOptional<U>)
     {
         m_pointer = &value;
         return *this;
     }
 
+    // Note: Disallows assignment from a temporary as this does not do any lifetime extension.
+    template<typename U>
+    requires(!IsSame<OptionalNone, RemoveCVReference<U>>)
+    ALWAYS_INLINE consteval Optional& operator=(RemoveReference<U> const&& value)
+    requires(CanBePlacedInOptional<U>)
+    = delete;
+
     ALWAYS_INLINE void clear()
     {
         m_pointer = nullptr;
diff --git a/Tests/AK/TestOptional.cpp b/Tests/AK/TestOptional.cpp
index cb17d62deb..2c0f3f49a5 100644
--- a/Tests/AK/TestOptional.cpp
+++ b/Tests/AK/TestOptional.cpp
@@ -272,6 +272,34 @@ TEST_CASE(comparison_reference)
     EXPECT_NE(opt1, opt3);
 }
 
+template<typename To, typename From>
+struct CheckAssignments;
+
+template<typename To, typename From>
+requires(requires { declval<To>() = declval<From>(); })
+struct CheckAssignments<To, From> {
+    static constexpr bool allowed = true;
+};
+
+template<typename To, typename From>
+requires(!requires { declval<To>() = declval<From>(); })
+struct CheckAssignments<To, From> {
+    static constexpr bool allowed = false;
+};
+
+static_assert(CheckAssignments<Optional<int>, int>::allowed);
+static_assert(!CheckAssignments<Optional<int*>, double*>::allowed);
+
+static_assert(CheckAssignments<Optional<int&>, int&>::allowed);
+static_assert(!CheckAssignments<Optional<int&>, int const&>::allowed);
+static_assert(!CheckAssignments<Optional<int&>, int&&>::allowed);
+static_assert(!CheckAssignments<Optional<int&>, int const&&>::allowed);
+
+static_assert(CheckAssignments<Optional<int const&>, int&>::allowed);
+static_assert(CheckAssignments<Optional<int const&>, int const&>::allowed);
+static_assert(CheckAssignments<Optional<int const&>, int&&>::allowed);       // Lifetime extension
+static_assert(CheckAssignments<Optional<int const&>, int const&&>::allowed); // Lifetime extension
+
 TEST_CASE(string_specialization)
 {
     EXPECT_EQ(sizeof(Optional<String>), sizeof(String));