diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b9cc13fc6..aea86a3f1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 <!-- towncrier release notes start -->
+## 0.17.1 (2024-12-31)
+
+
+### Bug Fixes
+
+- Fixed lint failure for resources that have two `on_resync` decorators
+
+
 ## 0.17.0 (2024-12-31)
 
 
diff --git a/port_ocean/context/ocean.py b/port_ocean/context/ocean.py
index c9d37f37db..a414568c13 100644
--- a/port_ocean/context/ocean.py
+++ b/port_ocean/context/ocean.py
@@ -74,7 +74,9 @@ def on_resync(
         self,
         kind: str | None = None,
     ) -> Callable[[RESYNC_EVENT_LISTENER], RESYNC_EVENT_LISTENER | None]:
-        def wrapper(function: RESYNC_EVENT_LISTENER) -> RESYNC_EVENT_LISTENER | None:
+        def wrapper(
+            function: RESYNC_EVENT_LISTENER | None,
+        ) -> RESYNC_EVENT_LISTENER | None:
             if not self.app.config.event_listener.should_resync:
                 logger.debug(
                     "Webhook only event listener is used, resync events are ignored"
diff --git a/port_ocean/core/integrations/mixins/events.py b/port_ocean/core/integrations/mixins/events.py
index c422d05458..b760c86a85 100644
--- a/port_ocean/core/integrations/mixins/events.py
+++ b/port_ocean/core/integrations/mixins/events.py
@@ -46,7 +46,7 @@ def on_start(self, func: START_EVENT_LISTENER) -> START_EVENT_LISTENER:
         return func
 
     def on_resync(
-        self, func: RESYNC_EVENT_LISTENER, kind: str | None = None
+        self, func: RESYNC_EVENT_LISTENER| None, kind: str | None = None
     ) -> RESYNC_EVENT_LISTENER:
         """Register a function as a listener for a "resync" event.
 
@@ -57,6 +57,8 @@ def on_resync(
         Returns:
             RESYNC_EVENT_LISTENER: The input function, unchanged.
         """
+        if func is None:
+            return None
         if kind is None:
             logger.debug(f"Registering resync event listener any kind")
         else:
diff --git a/pyproject.toml b/pyproject.toml
index d991bc34d0..61268f0d55 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "port-ocean"
-version = "0.17.0"
+version = "0.17.1"
 description = "Port Ocean is a CLI tool for managing your Port projects."
 readme = "README.md"
 homepage = "https://app.getport.io"