diff --git a/command_event.c b/command_event.c
index 0dc1f8bfd1..83a8014340 100644
--- a/command_event.c
+++ b/command_event.c
@@ -81,8 +81,14 @@ static void event_init_remote(void)
    driver_t *driver     = driver_get_ptr();
    settings_t *settings = config_get_ptr();
 
-   if (!(driver->remote = rarch_remote_new(55400,1)))
-      RARCH_ERR("Failed to initialize remote gamepad interface.\n");
+   for(int i=0; i < settings->input.max_users; i++)
+   {
+      if (settings->network_remote_enable[i])
+      {
+         if (!(driver->remote = rarch_remote_new(55400 + i,i)))
+            RARCH_ERR("Failed to initialize remote gamepad interface.\n");
+      }
+   }
 }
 #endif
 
diff --git a/configuration.h b/configuration.h
index 885961b3db..a01b5be857 100644
--- a/configuration.h
+++ b/configuration.h
@@ -347,6 +347,8 @@ typedef struct settings
    bool network_cmd_enable;
    unsigned network_cmd_port;
    bool stdin_cmd_enable;
+   bool network_remote_enable[MAX_USERS];
+   unsigned network_remote_base_port;
    bool debug_panel_enable;
 
    char core_assets_directory[PATH_MAX_LENGTH];