diff --git a/voicegardens/static/voicegardens.js b/voicegardens/static/voicegardens.js
index 2c1ef4d..53248ed 100644
--- a/voicegardens/static/voicegardens.js
+++ b/voicegardens/static/voicegardens.js
@@ -33,12 +33,6 @@ var stopButton;
 var leafButton;
 var aboutButton;
 
-// Time-out used to stop a recording in case the user forgets to stop it
-// themselves. It also gurantees to turn off the mic in case of some unknown
-// error that we didn't take into consideration. This is 30 seconds in
-// milliseconds.
-var recordingTimeout = 30000;
-
 // The x,y coordinates which shows where the window position is. This is useful
 // because we use the `translate` function to offset the window view in
 // relation to the canvas (users can drag their view across the "environment")
@@ -64,7 +58,7 @@ function record() {
    * Start recording a sound.
    **/
   if (microphone.enabled) {
-    setTimeout(recorder.record(recording), recordingTimeout);
+    recorder.record(recording);
   }
 }