diff --git a/addons/api/mirage/factories/session-recording.js b/addons/api/mirage/factories/session-recording.js
index acdbc8788..39abefb7d 100644
--- a/addons/api/mirage/factories/session-recording.js
+++ b/addons/api/mirage/factories/session-recording.js
@@ -30,13 +30,10 @@ export default factory.extend({
       user.id = 'deleted_user';
       const session = pickRandomElement(server.schema.sessions.all().models);
       session.id = 'deleted_session';
-      const target = session.target;
-      target.id = 'deleted_target';
-
-      const storageBucket = pickRandomElement(
-        server.schema.storageBuckets.all().models
+      const target = pickRandomElement(
+        server.schema.targets.where((target) => target.storage_bucket_id).models
       );
-      target.storage_bucket_id = storageBucket.id;
+      target.id = 'deleted_target';
 
       sessionRecording.update({
         user,
@@ -50,12 +47,9 @@ export default factory.extend({
     afterCreate(sessionRecording, server) {
       const user = pickRandomElement(server.schema.users.all().models);
       const session = pickRandomElement(server.schema.sessions.all().models);
-      const target = session.target;
-
-      const storageBucket = pickRandomElement(
-        server.schema.storageBuckets.all().models
+      const target = pickRandomElement(
+        server.schema.targets.where((target) => target.storage_bucket_id).models
       );
-      target.storage_bucket_id = storageBucket.id;
 
       sessionRecording.update({
         user,
diff --git a/addons/api/mirage/factories/target.js b/addons/api/mirage/factories/target.js
index 8a4a93cc6..36b990584 100644
--- a/addons/api/mirage/factories/target.js
+++ b/addons/api/mirage/factories/target.js
@@ -8,7 +8,7 @@ import { trait } from 'miragejs';
 import { faker } from '@faker-js/faker';
 import permissions from '../helpers/permissions';
 import generateId from '../helpers/id';
-import { TYPES_TARGET } from 'api/models/target';
+import { TYPES_TARGET, TYPE_TARGET_SSH } from 'api/models/target';
 
 const randomBoolean = (chance = 0.5) => Math.random() < chance;
 const hostSetChance = 0.3;
@@ -72,7 +72,8 @@ export default factory.extend({
       const randomlySelectedStorageBucket = faker.helpers.arrayElement(
         server.schema.storageBuckets.all().models
       );
-      if (randomlySelectedStorageBucket && randomBoolean()) {
+
+      if (randomlySelectedStorageBucket && target.type === TYPE_TARGET_SSH) {
         target.update({ storage_bucket_id: randomlySelectedStorageBucket.id });
       }