diff --git a/setup/pi/configure-ap.sh b/setup/pi/configure-ap.sh
index 1be4460f..6be6f691 100644
--- a/setup/pi/configure-ap.sh
+++ b/setup/pi/configure-ap.sh
@@ -22,6 +22,12 @@ then
   exit 1
 fi
 
+if [ ! -e /etc/wpa_supplicant/wpa_supplicant.conf ]
+then
+  log_progress "No wpa_supplicant, skipping AP setup."
+  exit 0
+fi
+
 if ! grep -q id_str /etc/wpa_supplicant/wpa_supplicant.conf
 then
   IP=${AP_IP:-"192.168.66.1"}