diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index 9cbf6f03..bdd7d774 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -18,7 +18,7 @@
     dest: "{{ matrix_docker_coturn_src_files_path }}"
     version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
-  when: "matrix_raspberry_pi"
+  when: "matrix_coturn_enabled|bool and matrix_raspberry_pi"
 
 - name: Ensure Coturn Docker image is build (Raspberry pi)
   docker_image:
@@ -28,7 +28,7 @@
       dockerfile: Dockerfile
       path: "{{ matrix_docker_coturn_src_files_path }}"
       pull: yes
-  when: "matrix_raspberry_pi"
+  when: "matrix_coturn_enabled|bool and matrix_raspberry_pi"
 
 - name: Ensure Coturn configuration path exists
   file: