diff --git a/lib/files/jitsi/restart-when-idle.sh b/lib/files/jitsi/restart-when-idle.sh
new file mode 100755
index 0000000..8a13dc8
--- /dev/null
+++ b/lib/files/jitsi/restart-when-idle.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+json() {
+	python3 -c "
+import json,sys
+try:
+	print(json.load(sys.stdin)$@)
+except IndexError:
+	pass
+"
+}
+
+while true; do
+	ENDPOINTS=$(curl -s http://127.0.0.1:8080/colibri/stats |json "['local_active_endpoints']")
+	[ "$ENDPOINTS" = "0" -o -z "$ENDPOINTS" ] && break
+	sleep 1m
+done
+echo IDLE
+
+/federated/bin/stop jitsi
+/federated/bin/start jitsi
diff --git a/lib/jitsi.sh b/lib/jitsi.sh
index 44880ab..58a69ea 100644
--- a/lib/jitsi.sh
+++ b/lib/jitsi.sh
@@ -28,6 +28,8 @@ EOF
 # Extract Jitsi's gen-password.sh into /federated/apps/jitsi
 install -c -m 755 /federated/lib/files/jitsi/gen-passwords.sh /federated/apps/jitsi/
 
+[ "$JITSI_SCALE" = "server" ] && install -c -m 755 /federated/lib/files/jitsi/restart-when-idle.sh /federated/apps/jitsi/
+
 # Create docker compose file
 cat > /federated/apps/jitsi/docker-compose.yml <<EOF
 services: