diff --git a/defaults/main.yml b/defaults/main.yml
index 6656c6b..7dab392 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,3 +2,4 @@ mosquitto_pid_file: /var/run/mosquitto.pid
 mosquitto_user: mosquitto
 mosquitto_group: mosquitto
 mosquitto_port: 61000
+mosquitto_pid_dir: /var/run/mosquitto
diff --git a/tasks/install.yml b/tasks/install.yml
index 857b12b..8b02245 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -36,6 +36,13 @@
     group: root
     mode: 0644
 
+- name: Create folder for PIDFile
+  file:
+    path: "{{ mosquitto_pid_dir }}"
+    owner: "{{ mosquitto_user }}"
+    group: "{{ mosquitto_group }}"
+    state: directory
+
 - name: Copy systemd unit files
   template:
     src: "etc/systemd/system/mosquitto.service.j2"