diff --git a/components/Dashboard/Rooms.tsx b/components/Dashboard/Rooms.tsx
index 19fcda7..f44a4a3 100644
--- a/components/Dashboard/Rooms.tsx
+++ b/components/Dashboard/Rooms.tsx
@@ -261,7 +261,10 @@ export default function DashboardRoom() {
           </Dropdown>
 
           <button
-            onClick={() => handleModalType(ShowModalType.createRoom)}
+            onClick={() => {
+              setSelectedUpdateRoom(null);
+              handleModalType(ShowModalType.createRoom);
+            }}
             className="bg-gray-300 bg-opacity-25 p-2 rounded hover:bg-opacity-40"
           >
             <FaPlus className="text-lg text-white" />
diff --git a/components/Modals/CreateOrUpdateRoom.tsx b/components/Modals/CreateOrUpdateRoom.tsx
index 39f4d6b..689b2e2 100644
--- a/components/Modals/CreateOrUpdateRoom.tsx
+++ b/components/Modals/CreateOrUpdateRoom.tsx
@@ -40,6 +40,8 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) {
       setMembersSelected(props.updateRoom.members);
       setRoomType(props.updateRoom.type);
       setRoomAppxDateTime(props.updateRoom.approximateDateTime);
+    } else {
+      resetForm();
     }
   }, [props.updateRoom]);