diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d6b54d684..db9bc0da87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Ensure there is always at least one PHP-FPM pool defined ([#682](https://github.com/roots/trellis/pull/682))
 * Update galaxy roles for Ansible 2.2 compatibility ([#681](https://github.com/roots/trellis/pull/681))
 * Update to WP-CLI 0.25.0 for WP 4.7 compat ([#673](https://github.com/roots/trellis/pull/673))
 * Enable per-site setup for permalink structure ([#661](https://github.com/roots/trellis/pull/661))
diff --git a/roles/php/tasks/main.yml b/roles/php/tasks/main.yml
index 72b98a7113..55b27400d2 100644
--- a/roles/php/tasks/main.yml
+++ b/roles/php/tasks/main.yml
@@ -53,13 +53,6 @@
     path: /var/run/php7.0-fpm/
     state: directory
 
-- name: Disable default pool
-  command: mv /etc/php/7.0/fpm/pool.d/www.conf /etc/php/7.0/fpm/pool.d/www.disabled
-  args:
-    creates: /etc/php/7.0/fpm/pool.d/www.disabled
-  when: disable_default_pool
-  notify: reload php-fpm
-
 - name: PHP configuration file
   template:
     src: php.ini.j2
diff --git a/roles/wordpress-setup/tasks/main.yml b/roles/wordpress-setup/tasks/main.yml
index 3eead39622..606a3b3d74 100644
--- a/roles/wordpress-setup/tasks/main.yml
+++ b/roles/wordpress-setup/tasks/main.yml
@@ -28,6 +28,13 @@
     dest: /etc/php/7.0/fpm/pool.d/wordpress.conf
   notify: reload php-fpm
 
+- name: Disable default PHP-FPM pool
+  command: mv /etc/php/7.0/fpm/pool.d/www.conf /etc/php/7.0/fpm/pool.d/www.disabled
+  args:
+    creates: /etc/php/7.0/fpm/pool.d/www.disabled
+  when: disable_default_pool | default(true)
+  notify: reload php-fpm
+
 - include: nginx.yml
   tags: wordpress-setup-nginx