diff --git a/roles/matrix-etherpad/tasks/main.yml b/roles/matrix-etherpad/tasks/main.yml
index 09ead9735..27548aaf9 100644
--- a/roles/matrix-etherpad/tasks/main.yml
+++ b/roles/matrix-etherpad/tasks/main.yml
@@ -13,3 +13,9 @@
   tags:
     - setup-all
     - setup-etherpad
+
+- import_tasks: "{{ role_path }}/tasks/validate_config.yml"
+  when: run_setup|bool and matrix_etherpad_enabled|bool
+  tags:
+    - setup-all
+    - setup-etherpad
diff --git a/roles/matrix-etherpad/tasks/validate_config.yml b/roles/matrix-etherpad/tasks/validate_config.yml
index e5621a073..776235587 100644
--- a/roles/matrix-etherpad/tasks/validate_config.yml
+++ b/roles/matrix-etherpad/tasks/validate_config.yml
@@ -1,7 +1,5 @@
-- name: Fail if required Etherpad settings not defined
+- name: Fail if Etherpad is enabled without the Dimension integrations manager
   fail:
     msg: >-
-      You need to define a required configuration setting (`{{ item }}`) for using Etherpad.
-  with_items:
-    -
-  when: "matrix_etherpad_enabled and vars[item] == ''"
+      To integrate Etherpad notes with Matrix rooms you need to set "matrix_dimension_enabled" to true
+  when: "not matrix_dimension_enabled|bool"