diff --git a/i18n/en.json b/i18n/en.json
index 6ac210d0f8..0730795baf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8588,7 +8588,7 @@
   },
   {
     "id": "model.post.is_valid.file_ids.app_error",
-    "translation": "Invalid file ids. Note that uploads are limited to 5 files maximum. Please use additional posts for more files."
+    "translation": "Invalid file ids. Note that uploads are limited to 10 files maximum. Please use additional posts for more files."
   },
   {
     "id": "model.post.is_valid.filenames.app_error",
diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go
index 2e35d9929d..5df1a0a7eb 100644
--- a/store/sqlstore/post_store.go
+++ b/store/sqlstore/post_store.go
@@ -145,7 +145,7 @@ func newSqlPostStore(sqlStore *SqlStore, metrics einterfaces.MetricsInterface) s
 		table.ColMap("Hashtags").SetMaxSize(1000)
 		table.ColMap("Props").SetDataType(sqlStore.jsonDataType())
 		table.ColMap("Filenames").SetMaxSize(model.PostFilenamesMaxRunes)
-		table.ColMap("FileIds").SetMaxSize(300)
+		table.ColMap("FileIds").SetMaxSize(model.PostFileidsMaxRunes)
 		table.ColMap("RemoteId").SetMaxSize(26)
 	}
 
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index 23205eae00..98d620a880 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -1316,6 +1316,9 @@ func upgradeDatabaseToVersion600(sqlStore *SqlStore) {
 	sqlStore.GetMaster().ExecNoTimeout("UPDATE CommandWebhooks SET RootId = ParentId WHERE RootId = '' AND RootId != ParentId")
 	sqlStore.RemoveColumnIfExists("CommandWebhooks", "ParentId")
 
+	// allow 10 files per post
+	sqlStore.AlterColumnTypeIfExists("Posts", "FileIds", "text", "varchar(300)")
+
 	// saveSchemaVersion(sqlStore, Version600)
 	// }
 }