diff --git a/src/machine/m_at_socket5.c b/src/machine/m_at_socket5.c
index 9981f8e85..7c5ab697a 100644
--- a/src/machine/m_at_socket5.c
+++ b/src/machine/m_at_socket5.c
@@ -40,6 +40,7 @@
 #include <86box/sio.h>
 #include <86box/video.h>
 #include <86box/machine.h>
+#include <86box/sound.h>
 
 int
 machine_at_plato_init(const machine_t *model)
@@ -259,6 +260,9 @@ machine_at_optiplex_gxl_init(const machine_t *model)
     if (gfxcard[0] == VID_INTERNAL)
         device_add(machine_get_vid_device(machine));
 
+    if (sound_card_current[0] == SOUND_INTERNAL)
+        machine_snd = device_add(machine_get_snd_device(machine));
+
     device_add(&keyboard_ps2_ami_pci_device);
     device_add(&i430fx_device);
     device_add(&piix_device);
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index d9e6f2940..3e50442c1 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -10575,7 +10575,7 @@ const machine_t machines[] = {
             .max_multi = 3.0
         },
         .bus_flags = MACHINE_PS2_PCI,
-        .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_APM, /* Video: S3 Trio64V+ (86C765), Network: 3Com ETHERLINK III (3C509B) */
+        .flags = MACHINE_IDE_DUAL | MACHINE_VIDEO | MACHINE_SOUND | MACHINE_APM, /* Video: S3 Trio64V+ (86C765), Sound: Creative ViBRA 16S (CT2504), Network: 3Com ETHERLINK III (3C509B) */
         .ram = {
             .min = 8192,
             .max = 131072,
@@ -10590,7 +10590,7 @@ const machine_t machines[] = {
         .fdc_device = NULL,
         .sio_device = NULL,
         .vid_device = &s3_phoenix_trio64vplus_onboard_pci_device,
-        .snd_device = NULL,
+        .snd_device = &sb_vibra16s_onboard_device,
         .net_device = NULL /* not yet emulated */
     },
     /* According to tests from real hardware: This has AMI MegaKey KBC firmware on the