diff --git a/native/src/core/zygisk/daemon.rs b/native/src/core/zygisk/daemon.rs
index 80d21a151..03ec9b23d 100644
--- a/native/src/core/zygisk/daemon.rs
+++ b/native/src/core/zygisk/daemon.rs
@@ -96,6 +96,10 @@ impl MagiskD {
             module_list
                 .iter()
                 .map(|m| if is_64_bit { m.z64 } else { m.z32 })
+                // All fds passed over sockets have to be valid file descriptors.
+                // To work around this issue, send over STDOUT_FILENO as an indicator of an
+                // invalid fd as it will always be /dev/null in magiskd.
+                .map(|fd| if fd < 0 { STDOUT_FILENO } else { fd })
                 .collect()
         })
     }
@@ -166,15 +170,7 @@ impl MagiskD {
 
         // Next send modules
         if zygisk_should_load_module(flags) {
-            if let Some(module_list) = self.module_list.get() {
-                let module_fds: Vec<RawFd> = module_list
-                    .iter()
-                    .map(|m| if is_64_bit { m.z64 } else { m.z32 })
-                    // All fds passed over sockets have to be valid file descriptors.
-                    // To work around this issue, send over STDOUT_FILENO as an indicator of an
-                    // invalid fd as it will always be /dev/null in magiskd.
-                    .map(|fd| if fd < 0 { STDOUT_FILENO } else { fd })
-                    .collect();
+            if let Some(module_fds) = self.get_module_fds(is_64_bit) {
                 client.send_fds(&module_fds)?;
             }
         }