diff --git a/Sources/UnleashProxyClientSwift/Poller/Poller.swift b/Sources/UnleashProxyClientSwift/Poller/Poller.swift
index 07ce6f3..8ac48e8 100644
--- a/Sources/UnleashProxyClientSwift/Poller/Poller.swift
+++ b/Sources/UnleashProxyClientSwift/Poller/Poller.swift
@@ -44,10 +44,7 @@ public class Poller {
         context: Context,
         completionHandler: ((PollerError?) -> Void)? = nil
     ) -> Void {
-        if self.refreshInterval == 0 {
-            return
-        }
-
+  
         if toggles.isEmpty {
             self.getFeatures(context: context, completionHandler: completionHandler)
         } else {
@@ -56,6 +53,10 @@ public class Poller {
             completionHandler?(nil)
         }
 
+        if self.refreshInterval == 0 {
+            return
+        }
+
         let timer = Timer.scheduledTimer(withTimeInterval: Double(self.refreshInterval ?? 15), repeats: true) { timer in
             self.getFeatures(context: context)
         }