diff --git a/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java b/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
index 69ea6cdf0acadc460fb3ee5b2fb950e372fd948a..4599de7e4600bbd21d8f4e84840a36fdeafa129b 100644
--- a/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
+++ b/src/main/java/org/olat/modules/video/manager/VideoManagerImpl.java
@@ -857,9 +857,17 @@ public class VideoManagerImpl implements VideoManager {
 		return metadata;
 	}
 	
+	@Override
+	public boolean hasVideoMetadata(OLATResource videoResource) {
+		return videoMetadataDao.getVideoMetadata(videoResource) != null;
+	}
+	
 	@Override
 	public VideoMetaImpl getVideoMetadata(OLATResource videoResource) {
 		VideoMetaImpl meta = videoMetadataDao.getVideoMetadata(videoResource);
+		if (meta == null) {
+			return new VideoMetaImpl(800, 600, 5000);
+		}
 		return meta;
 	}
 	
diff --git a/src/main/java/org/olat/modules/video/manager/VideoMetadataDAO.java b/src/main/java/org/olat/modules/video/manager/VideoMetadataDAO.java
index 27c829d2919420348a79b42c756d8f60d756d124..992d757d8a755d298aa92f3f608f2a8414da4d46 100644
--- a/src/main/java/org/olat/modules/video/manager/VideoMetadataDAO.java
+++ b/src/main/java/org/olat/modules/video/manager/VideoMetadataDAO.java
@@ -66,7 +66,7 @@ public class VideoMetadataDAO {
 		if (metadata.size() > 0) {
 			return metadata.get(0);
 		} else {
-			return new VideoMetaImpl(800, 600, 5000);
+			return null;
 		}
 	}
 	
diff --git a/src/main/java/org/olat/upgrade/OLATUpgrade_11_3_0.java b/src/main/java/org/olat/upgrade/OLATUpgrade_11_3_0.java
index f3b5ad18909dab5d151c2313eab78a450de8b772..d8b93275d5e767bcd5bbef3a6126398cb9b2d97e 100644
--- a/src/main/java/org/olat/upgrade/OLATUpgrade_11_3_0.java
+++ b/src/main/java/org/olat/upgrade/OLATUpgrade_11_3_0.java
@@ -144,7 +144,7 @@ public class OLATUpgrade_11_3_0 extends OLATUpgrade {
 				String fileName = videoFile.getName();
 				long size = videoFile.length();
 				String format = FilenameUtils.getExtension(fileName);
-				if (videoManager.getVideoMetadata(videoResource) == null) {
+				if (videoManager.hasVideoMetadata(videoResource)) {
 					VideoMetaImpl entity = new VideoMetaImpl();
 					entity.setVideoResource(videoResource);
 					entity.setFormat(format);