diff --git a/src/mc/deps/core/common/bedrock/NonOwnerPointer.h b/src/mc/deps/core/common/bedrock/NonOwnerPointer.h
index e273bf2a98..656001b34b 100644
--- a/src/mc/deps/core/common/bedrock/NonOwnerPointer.h
+++ b/src/mc/deps/core/common/bedrock/NonOwnerPointer.h
@@ -11,11 +11,11 @@ class NonOwnerPointer {
     std::shared_ptr<Bedrock::EnableNonOwnerReferences::ControlBlock> mControlBlock;
     NonOwnerPointer(std::nullptr_t) noexcept {} // NOLINT
     T*       get() const { return reinterpret_cast<T*>(mControlBlock.get()); }
-    explicit operator bool() const noexcept { return get() != nullptr; }
+    explicit operator bool() const noexcept { return mControlBlock; }
 
-    [[nodiscard]] constexpr                operator T*() const { return get(); }
-    [[nodiscard]] constexpr T*             operator->() const { return get(); }
-    [[nodiscard]] constexpr decltype(auto) operator*() const { return *get(); }
+    [[nodiscard]] constexpr    operator T*() const { return get(); }
+    [[nodiscard]] constexpr T* operator->() const { return get(); }
+    [[nodiscard]] constexpr T& operator*() const { return *get(); }
 };
 
 template <class T>
@@ -35,5 +35,4 @@ template <class T1, class T2>
 [[nodiscard]] std::strong_ordering operator<=>(NonOwnerPointer<T1> const& l, NonOwnerPointer<T2> const& r) noexcept {
     return l.get() <=> r.get();
 }
-
 }; // namespace Bedrock