diff --git a/src/interface/efi/efi_driver.c b/src/interface/efi/efi_driver.c
index 2cefed2f..de0f61f9 100644
--- a/src/interface/efi/efi_driver.c
+++ b/src/interface/efi/efi_driver.c
@@ -44,6 +44,9 @@ static EFI_DRIVER_BINDING_PROTOCOL efi_driver_binding;
 /** List of controlled EFI devices */
 static LIST_HEAD ( efi_devices );
 
+/** We are currently disconnecting drivers */
+static int efi_driver_disconnecting;
+
 /**
  * Find EFI device
  *
@@ -159,6 +162,14 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 		goto err_already_started;
 	}
 
+	/* Do nothing if we are currently disconnecting drivers */
+	if ( efi_driver_disconnecting ) {
+		DBGC ( device, "EFIDRV %s refusing to start during "
+		       "disconnection\n", efi_handle_name ( device ) );
+		efirc = EFI_NOT_READY;
+		goto err_disconnecting;
+	}
+
 	/* Open device path */
 	if ( ( efirc = bs->OpenProtocol ( device,
 					  &efi_device_path_protocol_guid,
@@ -220,6 +231,7 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 				    efi_image_handle, device );
 	}
  err_open_path:
+ err_disconnecting:
  err_already_started:
 	return efirc;
 }
@@ -411,6 +423,7 @@ static int efi_driver_connect ( EFI_HANDLE device ) {
 	DBGC2_EFI_PROTOCOLS ( device, device );
 	DBGC ( device, "EFIDRV %s disconnecting existing drivers\n",
 	       efi_handle_name ( device ) );
+	efi_driver_disconnecting = 1;
 	if ( ( efirc = bs->DisconnectController ( device, NULL,
 						  NULL ) ) != 0 ) {
 		rc = -EEFI ( efirc );
@@ -419,6 +432,7 @@ static int efi_driver_connect ( EFI_HANDLE device ) {
 		       strerror ( rc ) );
 		/* Ignore the error and attempt to connect our drivers */
 	}
+	efi_driver_disconnecting = 0;
 	DBGC2 ( device, "EFIDRV %s after disconnecting:\n",
 		efi_handle_name ( device ) );
 	DBGC2_EFI_PROTOCOLS ( device, device );
@@ -450,9 +464,11 @@ static int efi_driver_disconnect ( EFI_HANDLE device ) {
 	EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
 
 	/* Disconnect our driver */
+	efi_driver_disconnecting = 1;
 	bs->DisconnectController ( device,
 				   efi_driver_binding.DriverBindingHandle,
 				   NULL );
+	efi_driver_disconnecting = 0;
 	return 0;
 }