diff --git a/src/backend/sources/AbstractSource.ts b/src/backend/sources/AbstractSource.ts
index cb872b8f..54c03ca4 100644
--- a/src/backend/sources/AbstractSource.ts
+++ b/src/backend/sources/AbstractSource.ts
@@ -533,7 +533,7 @@ export default abstract class AbstractSource extends AbstractComponent implement
         this.abortController.abort(reason);
         let elapsed = 0;
         let lastlog: Dayjs;
-        while(this.polling && elapsed < 10) {
+        while(this.polling && elapsed < (10 * this.stopPollingWaitInterval)) {
             if(lastlog === undefined || dayjs().diff(lastlog, 's') >= 2) {
                 this.logger.verbose(`Waiting for polling stop signal to be acknowledged (waited ${formatNumber(elapsed/1000)}s)`);
             }
@@ -581,7 +581,7 @@ export default abstract class AbstractSource extends AbstractComponent implement
                 }
             
 
-                const interval = this.getInterval();
+                const interval = this.getInterval(true);
                 const maxBackoff = this.getMaxBackoff();
                 let sleepTime = interval;
 
@@ -685,7 +685,7 @@ export default abstract class AbstractSource extends AbstractComponent implement
         return this.wakeAt;
     }
 
-    protected getInterval() {
+    protected getInterval(log?: boolean) {
         let interval = DEFAULT_POLLING_INTERVAL;
 
         if('interval' in this.config.data) {
diff --git a/src/backend/sources/MemorySource.ts b/src/backend/sources/MemorySource.ts
index 02b814a6..3400d2a4 100644
--- a/src/backend/sources/MemorySource.ts
+++ b/src/backend/sources/MemorySource.ts
@@ -385,7 +385,7 @@ export default class MemorySource extends AbstractSource {
 
     recentlyPlayedTrackIsValid = (playObj: any) => playObj.data.playDate.isBefore(dayjs().subtract(30, 's'))
 
-    protected getInterval(): number {
+    protected getInterval(log?: boolean): number {
         /**
          * If any player is progressing, reports position, and play has duration
          * then we can modify polling interval so that we check source data just before track is supposed to end
@@ -415,7 +415,7 @@ export default class MemorySource extends AbstractSource {
                 }
             }
         }
-        if(logDecrease !== undefined) {
+        if(logDecrease !== undefined && log) {
             this.logger.debug(logDecrease);
         }
         return interval;