diff --git a/package.json b/package.json
index af479d39..ca531447 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "author": "Calvin Montgomery",
   "name": "CyTube",
   "description": "Online media synchronizer and chat",
-  "version": "3.61.1",
+  "version": "3.62.0",
   "repository": {
     "url": "http://github.com/calzoneman/sync"
   },
diff --git a/src/config.js b/src/config.js
index 07cc7695..005effb2 100644
--- a/src/config.js
+++ b/src/config.js
@@ -397,11 +397,16 @@ function preprocessConfig(cfg) {
     });
 
     if (!cfg.io.throttle) {
-        cfg.io.throttle = {
-            'in-rate-limit': Infinity
-        };
+        cfg.io.throttle = {};
     }
 
+    cfg.io.throttle = Object.assign({
+        'in-rate-limit': Infinity
+    }, cfg.io.throttle);
+    cfg.io.throttle = Object.assign({
+        'bucket-capacity': cfg.io.throttle['in-rate-limit']
+    }, cfg.io.throttle);
+
     return cfg;
 }
 
diff --git a/src/io/ioserver.js b/src/io/ioserver.js
index 68602ccb..47c92133 100644
--- a/src/io/ioserver.js
+++ b/src/io/ioserver.js
@@ -251,16 +251,17 @@ class IOServer {
     }
 
     setRateLimiter(socket) {
-        const thunk = () => Config.get('io.throttle.in-rate-limit');
+        const refillRate = () => Config.get('io.throttle.in-rate-limit');
+        const capacity = () => Config.get('io.throttle.bucket-capacity');
 
-        socket._inRateLimit = new TokenBucket(thunk, thunk);
+        socket._inRateLimit = new TokenBucket(capacity, refillRate);
 
         socket.on('cytube:count-event', () => {
             if (socket._inRateLimit.throttle()) {
                 LOGGER.warn(
                     'Kicking client %s: exceeded in-rate-limit of %d',
                     socket.context.ipAddress,
-                    thunk()
+                    refillRate()
                 );
 
                 socket.emit('kick', { reason: 'Rate limit exceeded' });
diff --git a/test/util/token-bucket.js b/test/util/token-bucket.js
index f170f08a..5e66ba33 100644
--- a/test/util/token-bucket.js
+++ b/test/util/token-bucket.js
@@ -54,5 +54,13 @@ describe('TokenBucket', () => {
             assert(!bucket.throttle());
             assert.strictEqual(bucket.count, 0);
         });
+
+        it('handles infinite refill rate and capacity', () => {
+            bucket = new TokenBucket(Infinity, Infinity);
+
+            for (let i = 0; i < 100; i++) {
+                assert(!bucket.throttle(), 'should not throttle');
+            }
+        });
     });
 });