diff --git a/files/classes/orgy.py b/files/classes/orgy.py
index 4aab0e6ba..c97d8fcca 100644
--- a/files/classes/orgy.py
+++ b/files/classes/orgy.py
@@ -36,10 +36,9 @@ def get_orgy(v):
 	if not (v and v.allowed_in_chat): return None
 
 	orgy = g.db.query(Orgy).one_or_none()
-	if not orgy: return False
 
-	if orgy.end_utc and orgy.end_utc < time.time():
+	if orgy and orgy.end_utc and orgy.end_utc < time.time():
 		g.db.delete(orgy)
-		return False
+		return None
 
-	return True
+	return orgy