diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h
index 1b1d9dc9ae..f62c8c152f 100644
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -239,14 +239,8 @@
 				#define USB_CAN_BE_DEVICE
 			#endif
 
-			#if ( defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))
-				#if !defined(USB_DEVICE_ONLY)
-					#define USB_DEVICE_ONLY
-				#endif
-			#elif (!defined(USB_CAN_BE_DEVICE) &&  defined(USB_CAN_BE_HOST))
-				#if !defined(USB_HOST_ONLY)
-					#define USB_HOST_ONLY
-				#endif
+			#if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
+				#define USB_CAN_BE_BOTH
 			#endif
 
 			#if defined(USB_HOST_ONLY)