diff --git a/src/drivers/net/efi/mnp.c b/src/drivers/net/efi/mnp.c
index 3c839d968..212c712df 100644
--- a/src/drivers/net/efi/mnp.c
+++ b/src/drivers/net/efi/mnp.c
@@ -44,7 +44,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 static int mnp_supported ( EFI_HANDLE device ) {
 	EFI_GUID *binding = &efi_managed_network_service_binding_protocol_guid;
 
-	return snpnet_supported ( device, binding );
+	return snpnet_supported ( device, binding, 0 );
 }
 
 /** EFI MNP driver */
diff --git a/src/drivers/net/efi/snp.c b/src/drivers/net/efi/snp.c
index 2e0d9df3a..a675050e4 100644
--- a/src/drivers/net/efi/snp.c
+++ b/src/drivers/net/efi/snp.c
@@ -41,8 +41,9 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  * @ret rc		Return status code
  */
 static int snp_supported ( EFI_HANDLE device ) {
+	EFI_GUID *protocol = &efi_simple_network_protocol_guid;
 
-	return snpnet_supported ( device, &efi_simple_network_protocol_guid );
+	return snpnet_supported ( device, protocol, 1 );
 }
 
 /**
@@ -52,8 +53,9 @@ static int snp_supported ( EFI_HANDLE device ) {
  * @ret rc		Return status code
  */
 static int nii_supported ( EFI_HANDLE device ) {
+	EFI_GUID *protocol = &efi_nii31_protocol_guid;
 
-	return snpnet_supported ( device, &efi_nii31_protocol_guid );
+	return snpnet_supported ( device, protocol, 1 );
 }
 
 /** EFI SNP driver */
diff --git a/src/drivers/net/efi/snpnet.c b/src/drivers/net/efi/snpnet.c
index 109eecf01..8427b6ce3 100644
--- a/src/drivers/net/efi/snpnet.c
+++ b/src/drivers/net/efi/snpnet.c
@@ -504,9 +504,11 @@ static struct net_device_operations snpnet_operations = {
  *
  * @v device		EFI device handle
  * @v protocol		Protocol GUID
+ * @v inhibit_wifi	Inhibit wireless devices
  * @ret rc		Return status code
  */
-int snpnet_supported ( EFI_HANDLE device, EFI_GUID *protocol ) {
+int snpnet_supported ( EFI_HANDLE device, EFI_GUID *protocol,
+		       int inhibit_wifi ) {
 	EFI_HANDLE parent;
 	int rc;
 
@@ -536,9 +538,19 @@ int snpnet_supported ( EFI_HANDLE device, EFI_GUID *protocol ) {
 		DBGC2 ( device, "%s\n", efi_handle_name ( parent ) );
 		return -ENOTTY;
 	}
-
 	DBGC ( device, "HANDLE %s is a %s device\n",
 	       efi_handle_name ( device ), efi_guid_ntoa ( protocol ) );
+
+	/* Check for wireless devices, if applicable */
+	if ( inhibit_wifi &&
+	     ( ( efi_test ( device, &efi_wifi2_protocol_guid ) ) == 0 ) ) {
+		DBGC ( device, "HANDLE %s is wireless: assuming vendor %s "
+		       "driver is too unreliable to use\n",
+		       efi_handle_name ( device ),
+		       efi_guid_ntoa ( protocol ) );
+		return -ENOTTY;
+	}
+
 	return 0;
 }
 
diff --git a/src/drivers/net/efi/snpnet.h b/src/drivers/net/efi/snpnet.h
index d3602a589..507350210 100644
--- a/src/drivers/net/efi/snpnet.h
+++ b/src/drivers/net/efi/snpnet.h
@@ -11,7 +11,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 struct efi_device;
 
-extern int snpnet_supported ( EFI_HANDLE device, EFI_GUID *protocol );
+extern int snpnet_supported ( EFI_HANDLE device, EFI_GUID *protocol,
+			      int inhibit_wifi );
 extern int snpnet_exclude ( EFI_HANDLE device );
 extern int snpnet_start ( struct efi_device *efidev );
 extern void snpnet_stop ( struct efi_device *efidev );
diff --git a/src/drivers/net/efi/snponly.c b/src/drivers/net/efi/snponly.c
index 88c74ed42..f0a5277a2 100644
--- a/src/drivers/net/efi/snponly.c
+++ b/src/drivers/net/efi/snponly.c
@@ -63,16 +63,20 @@ struct chained_protocol {
 	 * reinstalling the protocol instance.
 	 */
 	EFI_HANDLE device;
+	/** Assume wireless devices are unusable */
+	int inhibit_wifi;
 };
 
 /** Chainloaded SNP protocol */
 static struct chained_protocol chained_snp = {
 	.protocol = &efi_simple_network_protocol_guid,
+	.inhibit_wifi = 1,
 };
 
 /** Chainloaded NII protocol */
 static struct chained_protocol chained_nii = {
 	.protocol = &efi_nii31_protocol_guid,
+	.inhibit_wifi = 1,
 };
 
 /** Chainloaded MNP protocol */
@@ -166,10 +170,20 @@ static int chained_supported ( EFI_HANDLE device,
 			efi_guid_ntoa ( chained->protocol ) );
 		return -ENOTTY;
 	}
-
 	DBGC ( device, "CHAINED %s is the chainloaded %s\n",
 	       efi_handle_name ( device ),
 	       efi_guid_ntoa ( chained->protocol ) );
+
+	/* Check for wireless devices, if applicable */
+	if ( chained->inhibit_wifi &&
+	     ( ( efi_test ( device, &efi_wifi2_protocol_guid ) ) == 0 ) ) {
+		DBGC ( device, "CHAINED %s is wireless: assuming vendor %s "
+		       "driver is too unreliable to use\n",
+		       efi_handle_name ( device ),
+		       efi_guid_ntoa ( chained->protocol ) );
+		return -ENOTTY;
+	}
+
 	return 0;
 }