diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index ff0b78c8cf..6302a79a64 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -55,12 +55,19 @@ SWITCH_STANDARD_API(time_test_function)
 		stream->write_function(stream, "parameter missing\n");
 		return SWITCH_STATUS_SUCCESS;
 	}
+
 	mss = atol(cmd);
 
+	if (mss > 10000) {
+		mss = 10000;
+	}
+
 	if ((p = strchr(cmd, ' '))) {
 		max = atoi(p+1);
 		if (max < 0) {
-			max = 10;
+			max = 1;
+		} else if (max > 100) {
+			max = 100;
 		}
 	}