diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index e8a664a5375aef7a1ba8b8ba1e0c4d5a8f07ebe3..6c6b2d3f471cb4d5a2594166f2a62a2bfdf4796c 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1730,12 +1730,12 @@ bailoutandtrynormal:
 		ast_update_realtime("meetme", "confno", conf->confno, "members", members, NULL);
 		if (confflags & CONFFLAG_MARKEDUSER) 
 			conf->markedusers--;
+		/* Remove ourselves from the list */
+		AST_LIST_REMOVE(&conf->userlist, user, list);
 		if (AST_LIST_EMPTY(&conf->userlist)) {
 			/* close this one when no more users and no references*/
 			if (!conf->refcount)
 				conf_free(conf);
-		} else {
-			AST_LIST_REMOVE(&conf->userlist, user, list);
 		}
 		/* Return the number of seconds the user was in the conf */
 		snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));