diff --git a/libraries/libstratosphere/source/htclow/driver/htclow_driver_memory_management.cpp b/libraries/libstratosphere/source/htclow/driver/htclow_driver_memory_management.cpp
index 64b3fe8ba..6638ad10a 100644
--- a/libraries/libstratosphere/source/htclow/driver/htclow_driver_memory_management.cpp
+++ b/libraries/libstratosphere/source/htclow/driver/htclow_driver_memory_management.cpp
@@ -38,7 +38,7 @@ namespace ams::htclow::driver {
         /* Declare the memory pool. */
         alignas(RequiredAlignment) constinit u8 g_driver_memory[RequiredSize];
 
-        constexpr inline const socket::SystemConfigDefault SocketConfig(g_driver_memory, RequiredSize, SocketAllocatorSize);
+        constexpr inline const socket::SystemConfigDefault SocketConfig(g_driver_memory, RequiredSize, SocketAllocatorSize, 2);
 
     }
 
diff --git a/stratosphere/htc/source/htc_main.cpp b/stratosphere/htc/source/htc_main.cpp
index cf36bdb30..cfe5db814 100644
--- a/stratosphere/htc/source/htc_main.cpp
+++ b/stratosphere/htc/source/htc_main.cpp
@@ -203,7 +203,15 @@ namespace ams::htc {
             } else if (std::strstr(transport, "socket")) {
                 /* NOTE: Nintendo does not actually allow socket driver to be selected. */
                 /* Should we disallow this? Undesirable, because people will want to use docked tma. */
-                return htclow::impl::DriverType::Socket;
+
+                /* TODO: Right now, SocketDriver causes a hang on init. This is because */
+                /* the socket driver requires wi-fi, but wi-fi can't happen until the system is fully up. */
+                /* The system can't initialize fully until we acknowledge power state events. */
+                /* We can't acknowledge power state events until our driver is online. */
+                /* Resolving this chicken-and-egg problem without compromising design will require thought. */
+
+                //return htclow::impl::DriverType::Socket;
+                return DefaultHtclowDriverType;
             } else {
                 return DefaultHtclowDriverType;
             }