diff --git a/files/routes/chats.py b/files/routes/chats.py
index a5e6c9bf8..ef839501d 100644
--- a/files/routes/chats.py
+++ b/files/routes/chats.py
@@ -190,6 +190,9 @@ def schedule_orgy(v, chat_id):
 	if not title:
 		abort(400, "A title is required!")
 
+	if len(title) > 40:
+		abort(400, 'Title is too long (max 40 characters)')
+
 	normalized_link = normalize_url(link)
 
 	if start_utc:
diff --git a/files/templates/orgy_control.html b/files/templates/orgy_control.html
index af4046feb..ed86eca55 100644
--- a/files/templates/orgy_control.html
+++ b/files/templates/orgy_control.html
@@ -18,7 +18,7 @@
 									<label for="title">Title</label>
 								</div>
 								<div class="body w-lg-100">
-									<input id="title" autocomplete="off" type="text" name="title" class="form-control" placeholder="Required" required>
+									<input id="title" autocomplete="off" type="text" name="title" class="form-control" maxlength="40" placeholder="Required" required>
 								</div>
 							</div>
 							<div class="d-lg-flex border-bottom mt-3">