diff --git a/src/system/kernel/fs/socket.cpp b/src/system/kernel/fs/socket.cpp
index 1fc0066d6c..065e48be67 100644
--- a/src/system/kernel/fs/socket.cpp
+++ b/src/system/kernel/fs/socket.cpp
@@ -81,7 +81,8 @@ put_stack_interface_module()
 	if (atomic_add(&sStackInterfaceConsumers, -1) != 1)
 		return;
 
-#if 0 /* Just leave the stack loaded, for now. */
+	// Keep the stack loaded on non-KDEBUG kernels.
+#if KDEBUG
 	WriteLocker _(sLock);
 	if (atomic_get(&sStackInterfaceConsumers) > 0)
 		return;