diff --git a/consumer.js b/consumer.js
index 93aabfd..4b8e37b 100644
--- a/consumer.js
+++ b/consumer.js
@@ -128,7 +128,7 @@ function Consumer() {
     var nextStreamID = 1;
     function storeStream(stream) {
         nextStreamID = nextStreamID++ % 10000;
-        while (streams.hasOwnProperty(nextStreamID)) { nextStreamID++; }
+        while (streams.hasOwnProperty(nextStreamID)) { nextStreamID++ % 10000; }
         var id = nextStreamID;
         streams[id] = stream;
         stream.id = id;
diff --git a/worker.js b/worker.js
index 8fa4f34..a18309a 100644
--- a/worker.js
+++ b/worker.js
@@ -153,7 +153,7 @@ function Worker(vfs) {
     var nextStreamID = 1;
     function storeStream(stream) {
         nextStreamID = nextStreamID++ % 10000;
-        while (streams.hasOwnProperty(nextStreamID)) { nextStreamID++; }
+        while (streams.hasOwnProperty(nextStreamID)) { nextStreamID++ % 10000; }
         var id = nextStreamID;
         streams[id] = stream;
         stream.id = id;