diff --git a/briar-android/src/org/briarproject/system/AndroidSystemModule.java b/briar-android/src/org/briarproject/system/AndroidSystemModule.java
index 77aa22446..570d4fbbc 100644
--- a/briar-android/src/org/briarproject/system/AndroidSystemModule.java
+++ b/briar-android/src/org/briarproject/system/AndroidSystemModule.java
@@ -11,7 +11,7 @@ public class AndroidSystemModule extends AbstractModule {
 
 	protected void configure() {
 		bind(Clock.class).to(SystemClock.class);
-		bind(Timer.class).toInstance(new SystemTimer());
+		bind(Timer.class).to(SystemTimer.class);
 		bind(SeedProvider.class).to(AndroidSeedProvider.class);
 		bind(FileUtils.class).to(AndroidFileUtils.class);
 	}
diff --git a/briar-desktop/src/org/briarproject/system/DesktopSystemModule.java b/briar-desktop/src/org/briarproject/system/DesktopSystemModule.java
index baa137073..5a3badb9f 100644
--- a/briar-desktop/src/org/briarproject/system/DesktopSystemModule.java
+++ b/briar-desktop/src/org/briarproject/system/DesktopSystemModule.java
@@ -15,7 +15,7 @@ public class DesktopSystemModule extends AbstractModule {
 
 	protected void configure() {
 		bind(Clock.class).to(SystemClock.class);
-		bind(Timer.class).toInstance(new SystemTimer());
+		bind(Timer.class).to(SystemTimer.class);
 		if(OsUtils.isLinux())
 			bind(SeedProvider.class).to(LinuxSeedProvider.class);
 		bind(FileUtils.class).toInstance(new FileUtils() {