diff --git a/briar-core/src/org/briarproject/plugins/PollerImpl.java b/briar-core/src/org/briarproject/plugins/PollerImpl.java
index 50e79b3b27f77349908628121cd73597a6aee637..938997a7646d573188bd8716871c5196e10347b1 100644
--- a/briar-core/src/org/briarproject/plugins/PollerImpl.java
+++ b/briar-core/src/org/briarproject/plugins/PollerImpl.java
@@ -45,12 +45,13 @@ class PollerImpl implements Poller {
 
 	public void addPlugin(Plugin p) {
 		// Randomise first polling interval
-		schedule(p, randomise(p.getPollingInterval()), false);
+		if (p.shouldPoll())
+			schedule(p, randomise(p.getPollingInterval()), false);
 	}
 
 	public void pollNow(Plugin p) {
 		// Randomise next polling interval
-		schedule(p, 0, true);
+		if (p.shouldPoll()) schedule(p, 0, true);
 	}
 
 	private int randomise(int interval) {