diff --git a/openlp/core/common/registry.py b/openlp/core/common/registry.py
index 71978ae5d..252274d4d 100644
--- a/openlp/core/common/registry.py
+++ b/openlp/core/common/registry.py
@@ -128,7 +128,7 @@ class Registry(object):
         :param event: The function description..
         :param function: The function to be called when the event happens.
         """
-        if event in self.functions_list:
+        if event in self.functions_list and function in self.functions_list[event]:
             self.functions_list[event].remove(function)
 
     def execute(self, event, *args, **kwargs):