diff --git a/framework/entity/SecurityEntities.xml b/framework/entity/SecurityEntities.xml
index e5e7f8a26..c05880e2f 100644
--- a/framework/entity/SecurityEntities.xml
+++ b/framework/entity/SecurityEntities.xml
@@ -416,7 +416,7 @@ along with this software (see the LICENSE.md file). If not, see
         <field name="successfulLogin" type="text-indicator"/>
         <relationship type="one-nofk" related="moqui.security.UserAccount" short-alias="user">
             <description>No FK in order to allow externally authenticated users.</description></relationship>
-        <relationship type="one" related="moqui.server.Visit" short-alias="visit"/>
+        <relationship type="one-nofk" related="moqui.server.Visit" short-alias="visit"/>
     </entity>
     <entity entity-name="UserPasswordHistory" package="moqui.security" use="nontransactional" cache="never">
         <field name="userId" type="id" is-pk="true"/>
diff --git a/framework/entity/ServiceEntities.xml b/framework/entity/ServiceEntities.xml
index 7b51a3ab3..c2c06bf7f 100644
--- a/framework/entity/ServiceEntities.xml
+++ b/framework/entity/ServiceEntities.xml
@@ -194,7 +194,7 @@ along with this software (see the LICENSE.md file). If not, see
             <key-map field-name="parentMessageId" related="systemMessageId"/></relationship>
         <relationship type="one" title="Ack" related="moqui.service.message.SystemMessage" short-alias="ackMessage">
             <key-map field-name="ackMessageId" related="systemMessageId"/></relationship>
-        <relationship type="one" title="Trigger" related="moqui.server.Visit" short-alias="triggerVisit">
+        <relationship type="one-nofk" title="Trigger" related="moqui.server.Visit" short-alias="triggerVisit">
             <key-map field-name="triggerVisitId"/></relationship>
 
         <relationship type="many" related="moqui.service.message.SystemMessageError" short-alias="errors">