diff --git a/src/database/models/mod_item.rs b/src/database/models/mod_item.rs
index c97222e1e..e7bd44ab5 100644
--- a/src/database/models/mod_item.rs
+++ b/src/database/models/mod_item.rs
@@ -516,8 +516,15 @@ impl Mod {
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
-        // TODO: this could be optimized
-        futures::future::try_join_all(mod_ids.into_iter().map(|id| Self::get_full(id, exec))).await
+        let mut mods = Vec::new();
+
+        for mod_id in mod_ids {
+            mods.push(Self::get_full(mod_id, exec).await?)
+        }
+
+        Ok(mods)
+        /*// TODO: this could be optimized
+        futures::future::try_join_all(mod_ids.into_iter().map(|id| Self::get_full(id, exec))).await*/
     }
 }
 
diff --git a/src/database/models/version_item.rs b/src/database/models/version_item.rs
index 66ac1e989..9f7802cf3 100644
--- a/src/database/models/version_item.rs
+++ b/src/database/models/version_item.rs
@@ -568,9 +568,15 @@ impl Version {
     where
         E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
     {
-        // TODO: this could be optimized
-        futures::future::try_join_all(version_ids.into_iter().map(|id| Self::get_full(id, exec)))
-            .await
+        let mut versions = Vec::new();
+
+        for version_id in version_ids {
+            versions.push(Self::get_full(version_id, exec).await?)
+        }
+
+        Ok(versions)
+        /* futures::future::try_join_all(version_ids.into_iter().map(|id| Self::get_full(id, exec)))
+        .await*/
     }
 }