diff --git a/.changeset/forty-dragons-juggle.md b/.changeset/forty-dragons-juggle.md
new file mode 100644
index 000000000000..8abdfc63a7eb
--- /dev/null
+++ b/.changeset/forty-dragons-juggle.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue not allowing users to remove the password to join the room on room edit
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
index 2e41ec2904a8..09268dc6a43a 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -106,7 +106,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 			await saveAction({
 				rid: room._id,
 				...data,
-				...(data.joinCode && { joinCode: joinCodeRequired ? data.joinCode : '' }),
+				...((data.joinCode || 'joinCodeRequired' in data) && { joinCode: joinCodeRequired ? data.joinCode : '' }),
 				...((data.systemMessages || !hideSysMes) && {
 					systemMessages: hideSysMes && data.systemMessages,
 				}),