diff --git a/publicroomsapi/directory/directory.go b/publicroomsapi/directory/directory.go
index fafde3e6f..1e305f3ca 100644
--- a/publicroomsapi/directory/directory.go
+++ b/publicroomsapi/directory/directory.go
@@ -88,7 +88,7 @@ func SetVisibility(
 	}
 	var queryEventsRes api.QueryLatestEventsAndStateResponse
 	err = queryAPI.QueryLatestEventsAndState(req.Context(), &queryEventsReq, &queryEventsRes)
-	if err != nil {
+	if err != nil || len(queryEventsRes.StateEvents) == 0 {
 		util.GetLogger(req.Context()).WithError(err).Error("could not query events from room")
 		return jsonerror.InternalServerError()
 	}