diff --git a/fluid/instance.lua b/fluid/instance.lua
index 472480d..22ed786 100644
--- a/fluid/instance.lua
+++ b/fluid/instance.lua
@@ -133,7 +133,7 @@ function Instance:setSystem(system, eventName, callback, enable)
       for i = 1, #listeners do
          local listener = listeners[i]
 
-         if listener.callback == callback then
+         if listener.system == system and listener.callback == callback then
             listener.enabled = enable
             break
          end