diff --git a/libraries/libstratosphere/source/htc/server/rpc/htc_rpc_task_table.hpp b/libraries/libstratosphere/source/htc/server/rpc/htc_rpc_task_table.hpp
index 5a22e7cf9..5d5f54e09 100644
--- a/libraries/libstratosphere/source/htc/server/rpc/htc_rpc_task_table.hpp
+++ b/libraries/libstratosphere/source/htc/server/rpc/htc_rpc_task_table.hpp
@@ -50,7 +50,7 @@ namespace ams::htc::server::rpc {
                 return index < MaxTaskCount && m_valid[index];
             }
         public:
-            RpcTaskTable() : m_valid() { /* ... */ }
+            constexpr RpcTaskTable() = default;
 
             template<typename T> requires std::derived_from<T, Task>
             T *New(u32 index) {
@@ -74,7 +74,7 @@ namespace ams::htc::server::rpc {
             T *Get(u32 index) {
                 /* Check that the task is valid. */
                 if (!this->IsValid(index)) {
-                    return false;
+                    return nullptr;
                 }
 
                 /* Get the task pointer. */