diff --git a/src/mainboard/asrock/b85m_pro4/romstage.c b/src/mainboard/asrock/b85m_pro4/romstage.c
index 6a71abbe30..9bdb8dd4bd 100644
--- a/src/mainboard/asrock/b85m_pro4/romstage.c
+++ b/src/mainboard/asrock/b85m_pro4/romstage.c
@@ -28,7 +28,6 @@ void mb_get_spd_map(uint8_t spd_map[4])
 void mainboard_fill_pei_data(struct pei_data *pei_data)
 {
 	pei_data->ec_present = 0;
-	pei_data->gbe_enable = 1;
 
 	struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = {
 		/* Length, Enable, OCn#, Location */
diff --git a/src/mainboard/lenovo/t440p/romstage.c b/src/mainboard/lenovo/t440p/romstage.c
index e83530a8ea..8c2c5b643d 100644
--- a/src/mainboard/lenovo/t440p/romstage.c
+++ b/src/mainboard/lenovo/t440p/romstage.c
@@ -49,7 +49,6 @@ void mb_get_spd_map(uint8_t spd_map[4])
 void mainboard_fill_pei_data(struct pei_data *pei_data)
 {
 	pei_data->ec_present = 1;
-	pei_data->gbe_enable = 1;
 
 	struct usb2_port_setting usb2_ports[MAX_USB2_PORTS] = {
 		/* Length, Enable, OCn#, Location */
diff --git a/src/northbridge/intel/haswell/romstage.c b/src/northbridge/intel/haswell/romstage.c
index 2961299e7d..7016fd9a7e 100644
--- a/src/northbridge/intel/haswell/romstage.c
+++ b/src/northbridge/intel/haswell/romstage.c
@@ -3,6 +3,7 @@
 #include <arch/romstage.h>
 #include <console/console.h>
 #include <cf9_reset.h>
+#include <device/device.h>
 #include <timestamp.h>
 #include <cpu/x86/lapic.h>
 #include <cbmem.h>
@@ -37,6 +38,8 @@ static int make_channel_disabled_mask(const struct pei_data *pd, int ch)
 /* The romstage entry point for this platform is not mainboard-specific, hence the name */
 void mainboard_romstage_entry(void)
 {
+	const struct device *gbe = pcidev_on_root(0x19, 0);
+
 	int wake_from_s3;
 
 	struct pei_data pei_data = {
@@ -53,6 +56,7 @@ void mainboard_romstage_entry(void)
 		.temp_mmio_base = 0xfed08000,
 		.system_type = get_pch_platform_type(),
 		.tseg_size = CONFIG_SMM_TSEG_SIZE,
+		.gbe_enable = gbe && gbe->enabled,
 		.ddr_refresh_2x = CONFIG(ENABLE_DDR_2X_REFRESH),
 		.max_ddr3_freq = 1600,
 	};