diff --git a/src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java b/src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java
index e4dea97f92dd1f340e3cb0486b5d722a1dca7e24..36e442ac1c937575e4f83a7d971fd60715636cc8 100644
--- a/src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java
+++ b/src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java
@@ -573,10 +573,9 @@ public class FeedManagerImpl extends FeedManager {
 		RepositoryEntry entry = repositoryManager.lookupRepositoryEntry(feed, false);
 		if (entry != null && feed != null) {
 			Date whenTheFeedWasLastModified = feed.getLastModified();
-			if (whenTheFeedWasLastModified == null || entry.getLastModified().after(whenTheFeedWasLastModified)) {
+			if (feed.getTitle() == null || whenTheFeedWasLastModified == null || entry.getLastModified().after(whenTheFeedWasLastModified)) {
 				// Copy the title (only) initially
-				String feedTitle = feed.getTitle();
-				if (feedTitle == null) {
+				if (feed.getTitle() == null) {
 					feed.setTitle(entry.getDisplayname());
 				}
 				if (StringHelper.containsNonWhitespace(entry.getAuthors())) {
@@ -712,7 +711,7 @@ public class FeedManagerImpl extends FeedManager {
 			SyndFeed feed = input.build(new XmlReader(realUrl));
 			if (!feed.getEntries().isEmpty()) {
 				// check for enclosures
-				SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
+				SyndEntry entry = feed.getEntries().get(0);
 				if (type != null && type.indexOf("BLOG") >= 0) {
 					return new ValidatedURL(url, ValidatedURL.State.VALID);
 				}
diff --git a/src/main/java/org/olat/modules/webFeed/ui/FeedMainController.java b/src/main/java/org/olat/modules/webFeed/ui/FeedMainController.java
index bba69ab90452625355cce67962878c2d811f176d..23c3dc5eff27aa374b1702f9ab9666150f427224 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/FeedMainController.java
+++ b/src/main/java/org/olat/modules/webFeed/ui/FeedMainController.java
@@ -222,6 +222,7 @@ public class FeedMainController extends BasicController implements Activateable2
 	 * @see org.olat.core.gui.control.DefaultController#event(org.olat.core.gui.UserRequest,
 	 *      org.olat.core.gui.control.Controller, org.olat.core.gui.control.Event)
 	 */
+	@Override
 	protected void event(UserRequest ureq, Controller source, Event event) {
 		if (source == cmc) {
 			if (event.equals(CloseableModalController.CLOSE_MODAL_EVENT)) {
@@ -336,6 +337,7 @@ public class FeedMainController extends BasicController implements Activateable2
 	/**
 	 * @see org.olat.core.util.event.GenericEventListener#event(org.olat.core.gui.control.Event)
 	 */
+	@Override
 	public void event(Event event) {
 		if (event instanceof OLATResourceableJustBeforeDeletedEvent) {
 			OLATResourceableJustBeforeDeletedEvent ojde = (OLATResourceableJustBeforeDeletedEvent) event;