diff --git a/pkg/models/jsonschema/scene.go b/pkg/models/jsonschema/scene.go
index fcc43e725..e4eab0666 100644
--- a/pkg/models/jsonschema/scene.go
+++ b/pkg/models/jsonschema/scene.go
@@ -31,7 +31,7 @@ type SceneFile struct {
 	Width      int           `json:"width"`
 	Height     int           `json:"height"`
 	Framerate  string        `json:"framerate"`
-	Frames     int           `json:"frame"`
+	Frames     int           `json:"frames"`
 	Bitrate    int           `json:"bitrate"`
 }
 
diff --git a/pkg/sqlite/migrations/85_postmigrate.go b/pkg/sqlite/migrations/85_postmigrate.go
index 5e99c7ba0..5f9f53045 100644
--- a/pkg/sqlite/migrations/85_postmigrate.go
+++ b/pkg/sqlite/migrations/85_postmigrate.go
@@ -42,7 +42,7 @@ func (m *schema85PostMigrator) migrate(ctx context.Context) error {
 		Count int `db:"count"`
 	}{0}
 
-	if err := m.db.Get(&result, "SELECT COUNT(*) AS count FROM `video_files` WHERE `frames` = 0"); err != nil {
+	if err := m.db.Get(&result, "SELECT COUNT(*) AS count FROM `video_files` WHERE `frames` IS NULL"); err != nil {
 		return err
 	}
 
@@ -64,7 +64,7 @@ func (m *schema85PostMigrator) migrate(ctx context.Context) error {
 				FROM video_files vf
 				JOIN files f ON f.id = vf.file_id
 				JOIN folders ON folders.id = f.parent_folder_id
-				WHERE vf.frames = 0
+				WHERE vf.frames IS NULL
 			`
 			if lastID != 0 {
 				query += fmt.Sprintf(" AND f.id > %d", lastID)
diff --git a/pkg/sqlite/migrations/85_video_file_frames.up.sql b/pkg/sqlite/migrations/85_video_file_frames.up.sql
index 1b7f3d936..33d495f71 100644
--- a/pkg/sqlite/migrations/85_video_file_frames.up.sql
+++ b/pkg/sqlite/migrations/85_video_file_frames.up.sql
@@ -1 +1 @@
-ALTER TABLE video_files ADD COLUMN frames INTEGER NOT NULL DEFAULT 0;
\ No newline at end of file
+ALTER TABLE video_files ADD COLUMN frames INTEGER DEFAULT NULL;
\ No newline at end of file
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index fd4c14527..bbbb30baa 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -925,7 +925,7 @@ func makeFile(i int) models.File {
 			VideoCodec: getFileStringValue(i, "videoCodec"),
 			AudioCodec: getFileStringValue(i, "audioCodec"),
 			FrameRate:  getFileDuration(i) * 2,
-			Frames:     int64(getFileDuration(i)) * 3,
+			Frames:     int64(getFileDuration(i) * getFileDuration(i) * 2),
 			BitRate:    int64(getFileDuration(i)) * 3,
 		}
 	} else if i >= fileIdxStartImageFiles && i < fileIdxStartGalleryFiles {