diff --git a/hostapd/android.config b/hostapd/android.config
index b29382892..08d21f044 100644
--- a/hostapd/android.config
+++ b/hostapd/android.config
@@ -203,3 +203,10 @@ CONFIG_WPA_CLI_EDIT=y
 # Opportunistic Wireless Encryption (OWE)
 # Experimental implementation of draft-harkins-owe-07.txt
 #CONFIG_OWE=y
+
+# Wpa_supplicant's random pool is not necessary on Android. Randomness is
+# already provided by the entropymixer service which ensures sufficient
+# entropy is maintained across reboots. Commit b410eb1913 'Initialize
+# /dev/urandom earlier in boot' seeds /dev/urandom with that entropy before
+# either wpa_supplicant or hostapd are run.
+CONFIG_NO_RANDOM_POOL=y
diff --git a/hostapd/hostapd.android.rc b/hostapd/hostapd.android.rc
index d8e6a0698..26a87b808 100644
--- a/hostapd/hostapd.android.rc
+++ b/hostapd/hostapd.android.rc
@@ -10,7 +10,6 @@ on post-fs-data
     mkdir /data/misc/wifi/hostapd 0770 wifi wifi
 
 service hostapd /vendor/bin/hostapd \
-        -e /data/misc/wifi/entropy.bin \
         /data/misc/wifi/hostapd.conf
     class main
     user wifi
diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index a4b17b055..7dfaa0f14 100644
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -442,7 +442,13 @@ CONFIG_ANDROID_LOG=y
 # disabled. This will save some in binary size and CPU use. However, this
 # should only be considered for builds that are known to be used on devices
 # that meet the requirements described above.
-#CONFIG_NO_RANDOM_POOL=y
+
+# Wpa_supplicant's random pool is not necessary on Android. Randomness is
+# already provided by the entropymixer service which ensures sufficient
+# entropy is maintained across reboots. Commit b410eb1913 'Initialize
+# /dev/urandom earlier in boot' seeds /dev/urandom with that entropy before
+# either wpa_supplicant or hostapd are run.
+CONFIG_NO_RANDOM_POOL=y
 
 # IEEE 802.11n (High Throughput) support (mainly for AP mode)
 CONFIG_IEEE80211N=y