diff --git a/addon.xml b/addon.xml
index 554cbf8..4020ecb 100644
--- a/addon.xml
+++ b/addon.xml
@@ -6,6 +6,8 @@
   <extension point="xbmc.python.pluginsource" library="peertube.py">
     <provides>video</provides>
   </extension>
+  <extension point="xbmc.service" library="service.py"/>
+  </extension>
   <extension point="xbmc.addon.metadata">
     <summary lang="en_GB">Plugin for PeerTube</summary>
     <description lang="en_GB">PeerTube is a federated open source alternative to YouTube</description>
diff --git a/service.py b/service.py
new file mode 100644
index 0000000..522663b
--- /dev/null
+++ b/service.py
@@ -0,0 +1,10 @@
+import time
+import xbmc
+
+if __name__ == '__main__':
+    monitor = xbmc.Monitor()
+    
+    while not monitor.abortRequested():
+        if monitor.waitForAbort(1):
+            # Abort was requested while waiting. We must exit
+            break