diff --git a/conference.go b/conference.go
index 66a58fe..b2f6266 100644
--- a/conference.go
+++ b/conference.go
@@ -77,10 +77,11 @@ func Topics(ctxt ui.AmContext) (string, any, error) {
 		v := ctxt.GetSession("topic.conf").(int32)
 		if v == conf.ConfId {
 			trustSessionValues = true
-		} else {
-			ctxt.SetSession("topic.conf", conf.ConfId)
 		}
 	}
+	if !trustSessionValues {
+		ctxt.SetSession("topic.conf", conf.ConfId)
+	}
 	view := database.TopicViewActive
 	if trustSessionValues && ctxt.IsSession("topic.view") {
 		view = ctxt.GetSession("topic.view").(int)