diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index 46c9302590e0..5109e4d8a1d4 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -556,7 +556,7 @@ pnpbios_identify(driver_t *driver, device_t parent)
 	return;
 
     /* ACPI already active */
-    if (devclass_find("acpi") != NULL)
+    if (devclass_get_softc(devclass_find("acpi"), 0) != NULL)
 	return;
 
     /* get count of PnP devices */
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 46c9302590e0..5109e4d8a1d4 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -556,7 +556,7 @@ pnpbios_identify(driver_t *driver, device_t parent)
 	return;
 
     /* ACPI already active */
-    if (devclass_find("acpi") != NULL)
+    if (devclass_get_softc(devclass_find("acpi"), 0) != NULL)
 	return;
 
     /* get count of PnP devices */