diff --git a/handlers/main.yml b/handlers/main.yml
index d89abd9..ce64ed3 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,13 @@
 #SPDX-License-Identifier: MIT-0
 ---
 # handlers file for role-jellyfin
+- name: pause to ensure jellyfin has completely started on first run
+  ansible.builtin.pause:
+    seconds: 30
+  listen: "restart jellyfin"
+
 - name: restart jellyfin
   service:
     name: jellyfin
-    state: restarted
\ No newline at end of file
+    state: restarted
+  listen: "restart jellyfin"
\ No newline at end of file
diff --git a/tasks/main.yml b/tasks/main.yml
index e7fa3b6..f3e0cca 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -16,6 +16,12 @@
     owner: jellyfin
     group: jellyfin
 
+- name: ensure jellyfin is running
+  service:
+    name: jellyfin
+    state: started
+    enabled: yes
+
 - name: deploy jellyfin system.xml file
   ansible.builtin.copy:
     owner: jellyfin
@@ -23,9 +29,3 @@
     src: files/system.xml
     dest: /etc/jellyfin/system.xml
   notify: restart jellyfin
-
-- name: ensure jellyfin is running
-  service:
-    name: jellyfin
-    state: started
-    enabled: yes
\ No newline at end of file