diff --git a/frontend/src/components/oppgavebehandling-footer/update-in-gosys/update-in-gosys.tsx b/frontend/src/components/oppgavebehandling-footer/update-in-gosys/update-in-gosys.tsx
index 6fbd6a610..482e77d9e 100644
--- a/frontend/src/components/oppgavebehandling-footer/update-in-gosys/update-in-gosys.tsx
+++ b/frontend/src/components/oppgavebehandling-footer/update-in-gosys/update-in-gosys.tsx
@@ -147,7 +147,14 @@ const UpdateInGosysLoaded = ({ oppgavebehandling, enheter, initialBeskrivelse, c
 
                 <ReceivingEnhet
                   selectedEnhet={selectedEnhet}
-                  setSelectedEnhet={setSelectedEnhet}
+                  setSelectedEnhet={(e) => {
+                    if (e === selectedEnhet) {
+                      return;
+                    }
+
+                    setSelectedEnhet(e);
+                    setSelectedMappe(null);
+                  }}
                   error={enhetError}
                   enheter={enheter}
                   oppgavebehandling={oppgavebehandling}