diff --git a/components/net/sf/briar/crypto/CryptoComponentImpl.java b/components/net/sf/briar/crypto/CryptoComponentImpl.java
index db329f1878d371135864eaa47fba846649847ac3..2580d2ab253413ef71fdbe9273196015b43252c6 100644
--- a/components/net/sf/briar/crypto/CryptoComponentImpl.java
+++ b/components/net/sf/briar/crypto/CryptoComponentImpl.java
@@ -50,6 +50,7 @@ class CryptoComponentImpl implements CryptoComponent {
 
 	private final KeyParser keyParser;
 	private final KeyPairGenerator keyPairGenerator;
+	private final SecureRandom secureRandom;
 
 	@Inject
 	CryptoComponentImpl() {
@@ -62,6 +63,7 @@ class CryptoComponentImpl implements CryptoComponent {
 		} catch(GeneralSecurityException e) {
 			throw new RuntimeException(e);
 		}
+		secureRandom = new SecureRandom();
 	}
 
 	public ErasableKey deriveFrameKey(byte[] secret, boolean initiator) {
@@ -171,8 +173,7 @@ class CryptoComponentImpl implements CryptoComponent {
 	}
 
 	public SecureRandom getSecureRandom() {
-		// FIXME: Implement a PRNG (pony/rainbow/nyancat generator)
-		return new SecureRandom();
+		return secureRandom;
 	}
 
 	public Signature getSignature() {