2 files changed, 9 insertions, 5 deletions

diff --git a/server/types/models/actor/actor-follow.ts b/server/types/models/actor/actor-follow.ts
index 338158561..84042e228 100644
--- a/server/types/models/actor/actor-follow.ts
+++ b/server/types/models/actor/actor-follow.ts
@@ -7,7 +7,7 @@ import {
   MActorDefaultAccountChannel,
   MActorDefaultChannelId,
   MActorFormattable,
-  MActorHost,
+  MActorHostOnly,
   MActorUsername
 } from './actor'
 
@@ -21,7 +21,7 @@ export type MActorFollow = Omit<ActorFollowModel, 'ActorFollower' | 'ActorFollow
 
 export type MActorFollowFollowingHost =
   MActorFollow &
-  Use<'ActorFollowing', MActorUsername & MActorHost>
+  Use<'ActorFollowing', MActorUsername & MActorHostOnly>
 
 // ############################################################################
 
diff --git a/server/types/models/actor/actor.ts b/server/types/models/actor/actor.ts
index 280256bab..47e7b7091 100644
--- a/server/types/models/actor/actor.ts
+++ b/server/types/models/actor/actor.ts
@@ -29,7 +29,11 @@ export type MActorLight = Omit<MActor, 'privateKey' | 'privateKey'>
 
 // Some association attributes
 
-export type MActorHost = Use<'Server', MServerHost>
+export type MActorHostOnly = Use<'Server', MServerHost>
+export type MActorHost =
+  MActorLight &
+  Use<'Server', MServerHost>
+
 export type MActorRedundancyAllowedOpt = PickWithOpt<ActorModel, 'Server', MServerRedundancyAllowed>
 
 export type MActorDefaultLight =
@@ -68,8 +72,8 @@ export type MActorChannel =
 
 export type MActorDefaultAccountChannel = MActorDefault & MActorAccount & MActorChannel
 
-export type MActorServer =
-  MActor &
+export type MActorServerLight =
+  MActorLight &
   Use<'Server', MServer>
 
 // ############################################################################