diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
index e13c46e25..a8dbc2479 100644
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@ -802,7 +802,13 @@ get_room_occupants(Pid) ->
       dict:to_list(S#state.users)).
 
 get_room_occupants_number(Room, Host) ->
-    length(get_room_occupants(Room, Host)).
+    case get_room_pid(Room, Host) of
+	room_not_found ->
+	    throw({error, room_not_found});
+	Pid ->
+	    S = get_room_state(Pid),
+	    dict:size(S#state.users)
+    end.
 
 %%----------------------------
 %% Send Direct Invitation