diff --git a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
index ae430bcda..ffd9391b0 100644
--- a/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
+++ b/bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
@@ -95,16 +95,6 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
 		return s;
 	}
 
-	@Override
-	public Future<?> scheduleAtFixedRate(Runnable task, long delay,
-			long interval, TimeUnit unit) {
-		Runnable wrapped = () -> {
-			scheduleAtFixedRate(task, interval, interval, unit);
-			task.run();
-		};
-		return schedule(wrapped, delay, unit);
-	}
-
 	@Override
 	public Future<?> scheduleWithFixedDelay(Runnable task, long delay,
 			long interval, TimeUnit unit) {
diff --git a/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java b/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java
index b2e627ba2..dad4ef86c 100644
--- a/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java
+++ b/bramble-api/src/main/java/org/briarproject/bramble/api/system/TaskScheduler.java
@@ -20,12 +20,6 @@ public interface TaskScheduler {
 	 */
 	Future<?> schedule(Runnable task, long delay, TimeUnit unit);
 
-	/**
-	 * See {@link ScheduledExecutorService#scheduleAtFixedRate(Runnable, long, long, TimeUnit)}.
-	 */
-	Future<?> scheduleAtFixedRate(Runnable task, long delay, long interval,
-			TimeUnit unit);
-
 	/**
 	 * See {@link ScheduledExecutorService#scheduleWithFixedDelay(Runnable, long, long, TimeUnit)}.
 	 */
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java
index 449e343d6..82bd71a46 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/rendezvous/RendezvousPollerImpl.java
@@ -143,7 +143,7 @@ class RendezvousPollerImpl implements RendezvousPoller, Service, EventListener {
 		} catch (DbException e) {
 			throw new ServiceException(e);
 		}
-		scheduler.scheduleAtFixedRate(this::poll, POLLING_INTERVAL_MS,
+		scheduler.scheduleWithFixedDelay(this::poll, POLLING_INTERVAL_MS,
 				POLLING_INTERVAL_MS, MILLISECONDS);
 	}
 
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java
index 3d8e7d9bd..34af175b3 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/system/TaskSchedulerImpl.java
@@ -28,12 +28,6 @@ class TaskSchedulerImpl implements TaskScheduler {
 		return delegate.schedule(task, delay, unit);
 	}
 
-	@Override
-	public Future<?> scheduleAtFixedRate(Runnable task, long delay,
-			long interval, TimeUnit unit) {
-		return delegate.scheduleAtFixedRate(task, delay, interval, unit);
-	}
-
 	@Override
 	public Future<?> scheduleWithFixedDelay(Runnable task, long delay,
 			long interval, TimeUnit unit) {
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java b/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java
index 3c7285042..c7238cec3 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/rendezvous/RendezvousPollerImplTest.java
@@ -122,7 +122,7 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 					PendingContactStateChangedEvent.class, e ->
 					e.getPendingContactState() == OFFLINE)));
 			// Capture the poll task
-			oneOf(scheduler).scheduleAtFixedRate(with(any(Runnable.class)),
+			oneOf(scheduler).scheduleWithFixedDelay(with(any(Runnable.class)),
 					with(POLLING_INTERVAL_MS), with(POLLING_INTERVAL_MS),
 					with(MILLISECONDS));
 			will(new CaptureArgumentAction<>(capturePollTask, Runnable.class,
@@ -158,7 +158,7 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 					PendingContactStateChangedEvent.class, e ->
 					e.getPendingContactState() == FAILED)));
 			// Schedule the poll task
-			oneOf(scheduler).scheduleAtFixedRate(with(any(Runnable.class)),
+			oneOf(scheduler).scheduleWithFixedDelay(with(any(Runnable.class)),
 					with(POLLING_INTERVAL_MS), with(POLLING_INTERVAL_MS),
 					with(MILLISECONDS));
 		}});
@@ -467,7 +467,7 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 			oneOf(db).getPendingContacts(txn);
 			will(returnValue(emptyList()));
 			// Capture the poll task
-			oneOf(scheduler).scheduleAtFixedRate(with(any(Runnable.class)),
+			oneOf(scheduler).scheduleWithFixedDelay(with(any(Runnable.class)),
 					with(POLLING_INTERVAL_MS), with(POLLING_INTERVAL_MS),
 					with(MILLISECONDS));
 			will(new CaptureArgumentAction<>(capturePollTask, Runnable.class,
@@ -544,7 +544,7 @@ public class RendezvousPollerImplTest extends BrambleMockTestCase {
 					PendingContactStateChangedEvent.class, e ->
 					e.getPendingContactState() == OFFLINE)));
 			// Capture the poll task
-			oneOf(scheduler).scheduleAtFixedRate(with(any(Runnable.class)),
+			oneOf(scheduler).scheduleWithFixedDelay(with(any(Runnable.class)),
 					with(POLLING_INTERVAL_MS), with(POLLING_INTERVAL_MS),
 					with(MILLISECONDS));
 			will(new CaptureArgumentAction<>(capturePollTask, Runnable.class,