diff --git a/lib/pages/chat_details/chat_details.dart b/lib/pages/chat_details/chat_details.dart
index dce775fa6..e600f1a51 100644
--- a/lib/pages/chat_details/chat_details.dart
+++ b/lib/pages/chat_details/chat_details.dart
@@ -425,5 +425,11 @@ class ChatDetailsController extends State<ChatDetails> {
   bool showEditNameIcon = false;
   void hoverEditNameIcon(bool hovering) =>
       setState(() => showEditNameIcon = !showEditNameIcon);
+
+  @override
+  void initState() {
+    super.initState();
+    MatrixState.pangeaController.classController.addMissingRoomRules(roomId);
+  }
   // Pangea#
 }
diff --git a/lib/pangea/controllers/class_controller.dart b/lib/pangea/controllers/class_controller.dart
index c91eab1c0..6d028fda2 100644
--- a/lib/pangea/controllers/class_controller.dart
+++ b/lib/pangea/controllers/class_controller.dart
@@ -3,9 +3,11 @@ import 'dart:developer';
 
 import 'package:collection/collection.dart';
 import 'package:fluffychat/pangea/constants/local.key.dart';
+import 'package:fluffychat/pangea/constants/pangea_event_types.dart';
 import 'package:fluffychat/pangea/controllers/pangea_controller.dart';
 import 'package:fluffychat/pangea/extensions/client_extension.dart';
 import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
+import 'package:fluffychat/pangea/models/class_model.dart';
 import 'package:fluffychat/pangea/utils/class_code.dart';
 import 'package:fluffychat/pangea/utils/error_handler.dart';
 import 'package:flutter/foundation.dart';
@@ -156,4 +158,24 @@ class ClassController extends BaseController {
     // BE - check class code and if class code is correct, invite student to room
     // FE - look for invite from room and automatically accept
   }
+
+  Future<void> addMissingRoomRules(String? roomId) async {
+    if (roomId == null) return;
+    final Room? room = _pangeaController.matrixState.client.getRoomById(roomId);
+    if (room == null) return;
+
+    if (room.classSettings != null && room.pangeaRoomRules == null) {
+      try {
+        await _pangeaController.matrixState.client.setRoomStateWithKey(
+          roomId,
+          PangeaEventTypes.rules,
+          '',
+          PangeaRoomRules().toJson(),
+        );
+      } catch (err, stack) {
+        debugger(when: kDebugMode);
+        ErrorHandler.logError(e: err, s: stack);
+      }
+    }
+  }
 }