diff --git a/src/machine/m_xt_olivetti.c b/src/machine/m_xt_olivetti.c
index d9117787e..7eedc86bd 100644
--- a/src/machine/m_xt_olivetti.c
+++ b/src/machine/m_xt_olivetti.c
@@ -1137,8 +1137,6 @@ machine_xt_m24_init(const machine_t *model)
     m24_kbd_init(m24_kbd);
     device_add_ex(&m24_kbd_device, m24_kbd);
 
-    device_add(&st506_xt_wd1002a_wx1_nobios_device);
-
     return ret;
 }
 
@@ -1191,6 +1189,9 @@ machine_xt_m240_init(const machine_t *model)
 
     mm58274_init(nvr, model->nvrmask + 1);
 
+    if (hdc_type == HDC_INTERNAL)
+        device_add(&st506_xt_wd1002a_wx1_nobios_device);
+
     return ret;
 }
 
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index baa0d9cea..c16bf297b 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -2064,7 +2064,7 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_VIDEO | MACHINE_MOUSE | MACHINE_MFM,
+        .flags = MACHINE_VIDEO | MACHINE_MOUSE,
         .ram = {
             .min = 128,
             .max = 640,
@@ -2101,7 +2101,7 @@ const machine_t machines[] = {
             .max_multi = 0
         },
         .bus_flags = MACHINE_PC,
-        .flags = MACHINE_FLAGS_NONE,
+        .flags = MACHINE_MFM,
         .ram = {
             .min = 128,
             .max = 640,