diff --git a/packages/rest-api/index.ts b/packages/rest-api/index.ts
index 43297107c5..f44a8a0874 100644
--- a/packages/rest-api/index.ts
+++ b/packages/rest-api/index.ts
@@ -11,6 +11,7 @@ export { default as AbstractRequestApi } from './src/requestApi/AbstractRequestA
 export { ErrorTypes, errorOfType, getErrorResponseData } from './src/requestApi/error/ErrorTypes';
 export type { default as ErrorType } from './src/requestApi/error/errorTsType';
 export type { default as Link } from './src/requestApi/LinkTsType';
+export { default as apiPaths } from './src/requestApi/apiPaths';
 
 let isUnitTestModeOn = false;
 export const switchOnTestMode = () => {
diff --git a/packages/rest-api/src/requestApi/apiPaths.ts b/packages/rest-api/src/requestApi/apiPaths.ts
new file mode 100644
index 0000000000..72f1804ff8
--- /dev/null
+++ b/packages/rest-api/src/requestApi/apiPaths.ts
@@ -0,0 +1,5 @@
+const apiPaths = {
+  notatISak: '/k9/sak/api/notat',
+};
+
+export default apiPaths;
diff --git a/packages/sak-app/src/behandlingsupport/BehandlingSupportIndex.tsx b/packages/sak-app/src/behandlingsupport/BehandlingSupportIndex.tsx
index 3763e22b6b..036083822b 100644
--- a/packages/sak-app/src/behandlingsupport/BehandlingSupportIndex.tsx
+++ b/packages/sak-app/src/behandlingsupport/BehandlingSupportIndex.tsx
@@ -1,5 +1,6 @@
 import SupportMenySakIndex, { SupportTabs } from '@fpsak-frontend/sak-support-meny';
-import { httpErrorHandler, useLocalStorage } from '@fpsak-frontend/utils';
+import { httpErrorHandler } from '@fpsak-frontend/utils';
+import { apiPaths } from '@k9-sak-web/rest-api';
 import { useRestApiErrorDispatcher } from '@k9-sak-web/rest-api-hooks';
 import {
   ArbeidsgiverOpplysningerWrapper,
@@ -7,10 +8,11 @@ import {
   Fagsak,
   FeatureToggles,
   NavAnsatt,
+  NotatResponse,
   Personopplysninger,
 } from '@k9-sak-web/types';
 import axios from 'axios';
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useQuery } from 'react-query';
 import { useNavigate } from 'react-router-dom';
 import { getSupportPanelLocationCreator } from '../app/paths';
@@ -83,34 +85,33 @@ const BehandlingSupportIndex = ({
 }: OwnProps) => {
   const { addErrorMessage } = useRestApiErrorDispatcher();
   const [antallUlesteNotater, setAntallUlesteNotater] = useState(0);
-  const [lesteNotater] = useLocalStorage('lesteNotater', []);
 
-  const getNotater = (signal: AbortSignal) => {
+  const getNotater = (signal: AbortSignal) =>
     axios
-      .get(`/k9/sak/api/notat`, {
+      .get<NotatResponse[]>(apiPaths.notatISak, {
         signal,
         params: {
           saksnummer: fagsak.saksnummer,
         },
       })
-      .then(response => {
-        const ulesteNotater = response.data.filter(
-          notat => lesteNotater.findIndex(lestNotatId => lestNotatId === notat.notatId) === -1,
-        );
-        setAntallUlesteNotater(ulesteNotater.length);
-      })
+      .then(({ data }) => data)
       .catch(error => {
         httpErrorHandler(error?.response?.status, addErrorMessage, error?.response?.headers?.location);
       });
-  };
+
   const notaterQueryKey = ['notater', fagsak?.saksnummer];
-  useQuery({
+  const { data: notater } = useQuery({
     queryKey: notaterQueryKey,
     queryFn: ({ signal }) => getNotater(signal),
     enabled: featureToggles?.NOTAT_I_SAK && !!fagsak,
     refetchOnWindowFocus: false,
   });
 
+  useEffect(() => {
+    const ulesteNotater = (notater || []).filter(notat => !notat.skjult);
+    setAntallUlesteNotater(ulesteNotater?.length);
+  }, [notater]);
+
   const { selected: valgtSupportPanel, location } = useTrackRouteParam<string>({
     paramName: 'stotte',
     isQueryParam: true,
@@ -193,13 +194,7 @@ const BehandlingSupportIndex = ({
           />
         )}
         {aktivtSupportPanel === SupportTabs.NOTATER && featureToggles?.NOTAT_I_SAK && (
-          <NotaterIndex
-            saksnummer={fagsak.saksnummer}
-            behandlingId={behandlingId}
-            behandlingVersjon={behandlingVersjon}
-            fagsakPerson={fagsak.person}
-            navAnsatt={navAnsatt}
-          />
+          <NotaterIndex navAnsatt={navAnsatt} fagsak={fagsak} />
         )}
       </div>
     </>
diff --git a/packages/sak-app/src/behandlingsupport/notater/NotaterIndex.tsx b/packages/sak-app/src/behandlingsupport/notater/NotaterIndex.tsx
index 40cb781337..6891de4bc7 100644
--- a/packages/sak-app/src/behandlingsupport/notater/NotaterIndex.tsx
+++ b/packages/sak-app/src/behandlingsupport/notater/NotaterIndex.tsx
@@ -1,25 +1,31 @@
 import { LoadingPanel, requireProps } from '@fpsak-frontend/shared-components';
 import Notater from '@k9-sak-web/sak-notat';
-import { FagsakPerson, NavAnsatt } from '@k9-sak-web/types';
+import { Fagsak, NavAnsatt } from '@k9-sak-web/types';
 import React from 'react';
+import ErrorBoundary from '@k9-sak-web/sak-app/src/app/ErrorBoundary';
+import { useRestApiErrorDispatcher } from '@k9-sak-web/rest-api-hooks';
 
 interface OwnProps {
-  saksnummer: string;
-  behandlingId?: number;
-  behandlingVersjon?: number;
-  fagsakPerson?: FagsakPerson;
   navAnsatt: NavAnsatt;
+  fagsak: Fagsak;
 }
 
-const EMPTY_ARRAY = [];
-
 /**
  * NotaterIndex
  *
  * Container komponent. Har ansvar for å vise notater i saken.
  */
-export const NotaterIndex = ({ saksnummer, navAnsatt }: OwnProps) => (
-  <Notater fagsakId={saksnummer} navAnsatt={navAnsatt} />
-);
+export const NotaterIndex = ({ fagsak, navAnsatt }: OwnProps) => {
+  const { addErrorMessage } = useRestApiErrorDispatcher();
 
-export default requireProps(['saksnummer'], <LoadingPanel />)(NotaterIndex);
+  return (
+    <ErrorBoundary errorMessageCallback={addErrorMessage}>
+      <Notater
+        fagsakId={fagsak.saksnummer}
+        navAnsatt={navAnsatt}
+        fagsakHarPleietrengende={!!fagsak.pleietrengendeAktørId}
+      />
+    </ErrorBoundary>
+  );
+};
+export default requireProps(['fagsak'], <LoadingPanel />)(NotaterIndex);
diff --git a/packages/sak-notat/i18n/nb_NO.json b/packages/sak-notat/i18n/nb_NO.json
index 917d29864b..76fd439fba 100644
--- a/packages/sak-notat/i18n/nb_NO.json
+++ b/packages/sak-notat/i18n/nb_NO.json
@@ -2,6 +2,7 @@
   "NotatISakIndex.VisNotatTilknyttetPleietrengende": "Vis notat i alle saker tilknyttet pleietrengende",
   "NotatISakIndex.LeggTilNotatButton": "Legg til notat",
   "NotatISakIndex.IngenNotaterAlert": "Ingen notater er publisert i saken",
+  "NotatISakIndex.IngenAktiveNotaterAlert": "Ingen aktive notater i saken",
   "NotatISakIndex.NotaterISak": "Notater i sak",
   "NotatISakIndex.VisSkjulteNotater": "Vis skjulte notater",
   "NotatISakIndex.SkrivNyttNotat": "Skriv et nytt notat",
diff --git a/packages/sak-notat/package.json b/packages/sak-notat/package.json
index c7c5222a71..f167ecda03 100644
--- a/packages/sak-notat/package.json
+++ b/packages/sak-notat/package.json
@@ -6,6 +6,7 @@
   "private": true,
   "dependencies": {
     "@fpsak-frontend/utils": "1.0.0",
+    "@k9-sak-web/rest-api": "1.0.0",
     "@k9-sak-web/types": "1.0.0",
     "@navikt/aksel-icons": "5.8.0",
     "@navikt/ds-react": "5.8.0",
diff --git a/packages/sak-notat/src/Notater.tsx b/packages/sak-notat/src/Notater.tsx
index e0f304746a..a0a90e6df7 100644
--- a/packages/sak-notat/src/Notater.tsx
+++ b/packages/sak-notat/src/Notater.tsx
@@ -1,4 +1,4 @@
-import { NavAnsatt } from '@k9-sak-web/types';
+import { NavAnsatt, NotatResponse } from '@k9-sak-web/types';
 import { Alert, Button, Heading, Loader, Switch } from '@navikt/ds-react';
 import { CheckboxField, Form, TextAreaField } from '@navikt/ft-form-hooks';
 import React, { useState } from 'react';
@@ -6,7 +6,6 @@ import { UseFormReturn } from 'react-hook-form';
 import { FormattedMessage, RawIntlProvider, createIntl, createIntlCache } from 'react-intl';
 import messages from '../i18n/nb_NO.json';
 import ChatComponent from './components/ChatComponent';
-import { NotatResponse } from './types/NotatResponse';
 import styles from './notater.module.css';
 
 const cache = createIntlCache();
@@ -41,6 +40,7 @@ interface NotaterProps {
   notater: NotatResponse[];
   postNotatMutationError: boolean;
   formMethods: UseFormReturn<Inputs, any, undefined>;
+  fagsakHarPleietrengende: boolean;
 }
 
 const Notater: React.FunctionComponent<NotaterProps> = ({
@@ -53,6 +53,7 @@ const Notater: React.FunctionComponent<NotaterProps> = ({
   postNotatMutationError,
   submitSkjulNotat,
   formMethods,
+  fagsakHarPleietrengende,
 }) => {
   const [visSkjulteNotater, setVisSkjulteNotater] = useState(false);
 
@@ -62,6 +63,8 @@ const Notater: React.FunctionComponent<NotaterProps> = ({
 
   const submit = (data: Inputs) => submitNotat(data);
 
+  const alleNotaterErSkjulte = notater?.every(notat => notat.skjult);
+
   return (
     <RawIntlProvider value={intl}>
       {isLoading ? (
@@ -76,11 +79,35 @@ const Notater: React.FunctionComponent<NotaterProps> = ({
               <FormattedMessage id="NotatISakIndex.VisSkjulteNotater" />
             </Switch>
           </div>
+          <Form<Inputs> formMethods={formMethods} onSubmit={submit}>
+            <div className={styles.nyttNotat}>
+              <TextAreaField
+                name="notatTekst"
+                size="small"
+                label={<FormattedMessage id="NotatISakIndex.SkrivNyttNotat" />}
+              />
+            </div>
+            {fagsakHarPleietrengende && (
+              <CheckboxField
+                className={styles.visAlleNotater}
+                name="visNotatIAlleSaker"
+                label={<FormattedMessage id="NotatISakIndex.VisNotatTilknyttetPleietrengende" />}
+              />
+            )}
+            <Button type="submit" className={styles.leggTilNotatKnapp} size="small" variant="primary">
+              <FormattedMessage id="NotatISakIndex.LeggTilNotatButton" />
+            </Button>
+          </Form>
           {!hasGetNotaterError && notater?.length === 0 && (
             <Alert className={styles.alert} size="small" variant="info">
               <FormattedMessage id="NotatISakIndex.IngenNotaterAlert" />
             </Alert>
           )}
+          {alleNotaterErSkjulte && !visSkjulteNotater && notater?.length > 0 && (
+            <Alert className={styles.alert} size="small" variant="info">
+              <FormattedMessage id="NotatISakIndex.IngenAktiveNotaterAlert" />
+            </Alert>
+          )}
           {hasGetNotaterError && (
             <Alert className={styles.alert} size="small" variant="error">
               <FormattedMessage id="NotatISakIndex.NoeGikkGaltHentingNotater" />
@@ -107,23 +134,6 @@ const Notater: React.FunctionComponent<NotaterProps> = ({
                 ))}
             </div>
           )}
-          <Form<Inputs> formMethods={formMethods} onSubmit={submit}>
-            <div className={styles.nyttNotat}>
-              <TextAreaField
-                name="notatTekst"
-                size="small"
-                label={<FormattedMessage id="NotatISakIndex.SkrivNyttNotat" />}
-              />
-            </div>
-            <CheckboxField
-              className={styles.visAlleNotater}
-              name="visNotatIAlleSaker"
-              label={<FormattedMessage id="NotatISakIndex.VisNotatTilknyttetPleietrengende" />}
-            />
-            <Button type="submit" className={styles.leggTilNotatKnapp} size="small" variant="primary">
-              <FormattedMessage id="NotatISakIndex.LeggTilNotatButton" />
-            </Button>
-          </Form>
         </>
       )}
     </RawIntlProvider>
diff --git a/packages/sak-notat/src/NotaterIndex.tsx b/packages/sak-notat/src/NotaterIndex.tsx
index fb11c051ad..5fbd78844f 100644
--- a/packages/sak-notat/src/NotaterIndex.tsx
+++ b/packages/sak-notat/src/NotaterIndex.tsx
@@ -1,16 +1,14 @@
-import { useLocalStorage } from '@fpsak-frontend/utils';
 import { NavAnsatt } from '@k9-sak-web/types';
-import axios from 'axios';
 import React from 'react';
 import { useForm } from 'react-hook-form';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 import Notater, { Inputs, skjulNotatMutationVariables } from './Notater';
-import { NotatGjelderType } from './types/NotatGjelderType';
-import { NotatResponse } from './types/NotatResponse';
+import { getNotater, postNotat, skjulNotat } from './notatApi';
 
 interface NotaterIndexProps {
   fagsakId: string;
   navAnsatt: NavAnsatt;
+  fagsakHarPleietrengende: boolean;
 }
 
 interface postNotatMutationVariables {
@@ -20,8 +18,7 @@ interface postNotatMutationVariables {
   versjon?: number;
 }
 
-const NotaterIndex: React.FC<NotaterIndexProps> = ({ fagsakId, navAnsatt }) => {
-  const [lesteNotater, setLesteNotater] = useLocalStorage<number[]>('lesteNotater', []);
+const NotaterIndex: React.FC<NotaterIndexProps> = ({ fagsakId, navAnsatt, fagsakHarPleietrengende }) => {
   const queryClient = useQueryClient();
 
   const notaterQueryKey = ['notater', fagsakId];
@@ -33,48 +30,19 @@ const NotaterIndex: React.FC<NotaterIndexProps> = ({ fagsakId, navAnsatt }) => {
     },
   });
 
-  const getNotater = (signal: AbortSignal) =>
-    axios
-      .get<NotatResponse[]>(`/k9/sak/api/notat`, {
-        signal,
-        params: {
-          saksnummer: fagsakId,
-        },
-      })
-      .then(({ data }) => {
-        const sorterteNotater = [...data].sort(
-          (notatA, notatB) => +new Date(notatA.opprettetTidspunkt) - +new Date(notatB.opprettetTidspunkt),
-        );
-        setLesteNotater([
-          ...new Set([...lesteNotater, ...data.filter(notat => !notat.skjult).map(notat => notat.notatId)]),
-        ]);
-        return sorterteNotater;
-      });
-
   const {
     isLoading: getNotaterLoading,
     isError: hasGetNotaterError,
     data: notater,
-  } = useQuery({ queryKey: notaterQueryKey, queryFn: ({ signal }) => getNotater(signal), enabled: !!fagsakId });
-
-  const postNotat = (data: Inputs, id?: number, fagsakIdFraRedigertNotat?: string, versjon?: number) => {
-    let notatGjelderType;
-    if (!id) {
-      notatGjelderType = data.visNotatIAlleSaker ? NotatGjelderType.pleietrengende : NotatGjelderType.fagsak;
-    }
-    const postUrl = id ? '/k9/sak/api/notat/endre' : '/k9/sak/api/notat';
-    return axios.post(postUrl, {
-      notatTekst: data.notatTekst,
-      saksnummer: fagsakIdFraRedigertNotat || fagsakId,
-      notatGjelderType,
-      versjon: versjon || 0,
-      notatId: id,
-    });
-  };
+  } = useQuery({
+    queryKey: notaterQueryKey,
+    queryFn: ({ signal }) => getNotater(signal, fagsakId),
+    enabled: !!fagsakId,
+  });
 
   const postNotatMutation = useMutation(
     ({ data, id, fagsakIdFraRedigertNotat, versjon }: postNotatMutationVariables) =>
-      postNotat(data, id, fagsakIdFraRedigertNotat, versjon),
+      postNotat(data, fagsakId, id, fagsakIdFraRedigertNotat, versjon),
     {
       onSuccess: () => {
         formMethods.reset();
@@ -83,14 +51,6 @@ const NotaterIndex: React.FC<NotaterIndexProps> = ({ fagsakId, navAnsatt }) => {
     },
   );
 
-  const skjulNotat = (skjul: boolean, id: number, saksnummer: string, versjon: number) =>
-    axios.post('/k9/sak/api/notat/skjul', {
-      notatId: id,
-      skjul,
-      saksnummer,
-      versjon,
-    });
-
   const skjulNotatMutation = useMutation(
     ({ skjul, id, saksnummer, versjon }: skjulNotatMutationVariables) => skjulNotat(skjul, id, saksnummer, versjon),
     {
@@ -118,6 +78,7 @@ const NotaterIndex: React.FC<NotaterIndexProps> = ({ fagsakId, navAnsatt }) => {
       postNotatMutationError={postNotatMutation.isError}
       submitSkjulNotat={submitSkjulNotat}
       formMethods={formMethods}
+      fagsakHarPleietrengende={fagsakHarPleietrengende}
     />
   );
 };
diff --git a/packages/sak-notat/src/components/ChatComponent.tsx b/packages/sak-notat/src/components/ChatComponent.tsx
index 8629421282..7bf33e98ec 100644
--- a/packages/sak-notat/src/components/ChatComponent.tsx
+++ b/packages/sak-notat/src/components/ChatComponent.tsx
@@ -1,4 +1,4 @@
-import { NavAnsatt } from '@k9-sak-web/types';
+import { NavAnsatt, NotatResponse } from '@k9-sak-web/types';
 import { EyeSlashIcon, EyeWithPupilIcon, PencilIcon } from '@navikt/aksel-icons';
 import { BodyLong, Button, Chat, Label, Tag } from '@navikt/ds-react';
 import { Form, TextAreaField } from '@navikt/ft-form-hooks';
@@ -7,7 +7,6 @@ import { format } from 'date-fns';
 import React, { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { FormattedMessage } from 'react-intl';
-import { NotatResponse } from '../types/NotatResponse';
 import styles from './chatComponent.module.css';
 
 export enum ChatPosition {
@@ -56,7 +55,6 @@ const ChatComponent: React.FunctionComponent<ChatComponentProps> = ({
   fagsakId,
 }) => {
   const {
-    endretAv,
     endretTidspunkt,
     gjelderType,
     notatId,
@@ -65,10 +63,9 @@ const ChatComponent: React.FunctionComponent<ChatComponentProps> = ({
     opprettetTidspunkt,
     versjon,
     skjult,
+    kanRedigere,
   } = notat;
-  const erSistEndretAvGjeldendeBruker =
-    endretAv === navAnsatt.brukernavn || (!endretAv && opprettetAv === navAnsatt.brukernavn);
-  const position = erSistEndretAvGjeldendeBruker ? ChatPosition.Right : ChatPosition.Left;
+  const position = opprettetAv === navAnsatt.brukernavn ? ChatPosition.Right : ChatPosition.Left;
 
   const minLength3 = minLength(3);
   const maxLength2000 = maxLength(1500);
@@ -100,8 +97,16 @@ const ChatComponent: React.FunctionComponent<ChatComponentProps> = ({
     skjulNotat({ skjul: !skjult, id: notatId, saksnummer: fagsakId, versjon });
   };
 
-  const name = erSistEndretAvGjeldendeBruker ? 'Deg' : endretAv || opprettetAv;
-  const timestamp = format(new Date(endretTidspunkt || opprettetTidspunkt), 'dd.MM.yyyy H:mm');
+  const navnPåOppretter = opprettetAv === navAnsatt.brukernavn ? 'Deg' : opprettetAv;
+
+  const tidspunktStreng = () => {
+    const formatertOpprettetTidspunkt = format(new Date(opprettetTidspunkt), 'dd.MM.yy H:mm');
+    const formatertEndretTidspunkt = endretTidspunkt ? format(new Date(endretTidspunkt), 'dd.MM.yy H:mm') : undefined;
+    if (endretTidspunkt) {
+      return `(Endret: ${formatertEndretTidspunkt})  ${formatertOpprettetTidspunkt}`;
+    }
+    return formatertOpprettetTidspunkt;
+  };
 
   return (
     <Form<Inputs>
@@ -110,8 +115,8 @@ const ChatComponent: React.FunctionComponent<ChatComponentProps> = ({
       className={position === ChatPosition.Right ? styles.chatRight : styles.chatLeft}
     >
       <Chat
-        name={name}
-        timestamp={timestamp}
+        name={navnPåOppretter}
+        timestamp={tidspunktStreng()}
         position={position}
         variant={position === ChatPosition.Right ? 'info' : 'neutral'}
       >
@@ -148,15 +153,17 @@ const ChatComponent: React.FunctionComponent<ChatComponentProps> = ({
             </div>
             {readOnly && (
               <div className={styles.redigerSkjulNotatKnappContainer}>
-                <Button
-                  className={styles.redigerSkjulKnapp}
-                  onClick={toggleReadOnly}
-                  size="xsmall"
-                  variant="tertiary"
-                  icon={<PencilIcon aria-hidden />}
-                >
-                  <FormattedMessage id="NotatISakIndex.Rediger" />
-                </Button>
+                {kanRedigere && (
+                  <Button
+                    className={styles.redigerSkjulKnapp}
+                    onClick={toggleReadOnly}
+                    size="xsmall"
+                    variant="tertiary"
+                    icon={<PencilIcon aria-hidden />}
+                  >
+                    <FormattedMessage id="NotatISakIndex.Rediger" />
+                  </Button>
+                )}
                 <Button
                   onClick={toggleSkjulNotat}
                   className={styles.redigerSkjulKnapp}
diff --git a/packages/sak-notat/src/notatApi.ts b/packages/sak-notat/src/notatApi.ts
new file mode 100644
index 0000000000..370e6785a2
--- /dev/null
+++ b/packages/sak-notat/src/notatApi.ts
@@ -0,0 +1,43 @@
+import { apiPaths } from '@k9-sak-web/rest-api';
+import { NotatGjelderType, NotatResponse } from '@k9-sak-web/types';
+import axios from 'axios';
+import { Inputs } from './Notater';
+
+export const postNotat = (
+  data: Inputs,
+  fagsakId: string,
+  id?: number,
+  fagsakIdFraRedigertNotat?: string,
+  versjon?: number,
+) => {
+  let notatGjelderType;
+  if (!id) {
+    notatGjelderType = data.visNotatIAlleSaker ? NotatGjelderType.pleietrengende : NotatGjelderType.fagsak;
+  }
+  const postUrl = id ? '/k9/sak/api/notat/endre' : '/k9/sak/api/notat';
+  return axios.post(postUrl, {
+    notatTekst: data.notatTekst,
+    saksnummer: fagsakIdFraRedigertNotat || fagsakId,
+    notatGjelderType,
+    versjon: versjon || 0,
+    notatId: id,
+  });
+};
+
+export const skjulNotat = (skjul: boolean, id: number, saksnummer: string, versjon: number) =>
+  axios.post('/k9/sak/api/notat/skjul', {
+    notatId: id,
+    skjul,
+    saksnummer,
+    versjon,
+  });
+
+export const getNotater = (signal: AbortSignal, fagsakId: string) =>
+  axios
+    .get<NotatResponse[]>(apiPaths.notatISak, {
+      signal,
+      params: {
+        saksnummer: fagsakId,
+      },
+    })
+    .then(({ data }) => data);
diff --git a/packages/sak-notat/src/notater.module.css b/packages/sak-notat/src/notater.module.css
index 1c33cb7d6d..b2edaa1691 100644
--- a/packages/sak-notat/src/notater.module.css
+++ b/packages/sak-notat/src/notater.module.css
@@ -17,7 +17,7 @@
 .notater {
   display: grid;
   gap: 2.5rem;
-  margin-top: 1.25rem;
+  margin-top: 2.25rem;
 }
 
 .nyttNotat {
diff --git a/packages/storybook/stories/sak/NotatISakIndex.stories.tsx b/packages/storybook/stories/sak/NotatISakIndex.stories.tsx
index ac90a804a5..a1769987eb 100644
--- a/packages/storybook/stories/sak/NotatISakIndex.stories.tsx
+++ b/packages/storybook/stories/sak/NotatISakIndex.stories.tsx
@@ -23,6 +23,7 @@ export const VisNotatISakPanel = () => (
     <QueryClientProvider client={queryClient}>
       <NotatISakIndex
         fagsakId="1"
+        fagsakHarPleietrengende
         navAnsatt={{
           brukernavn: 'saksbeh',
           funksjonellTid: '2023-08-28T16:11:44.107219587',
@@ -52,6 +53,7 @@ const notater = [
     endretTidspunkt: undefined,
     fagsakId: '1',
     skjult: false,
+    kanRedigere: true,
   },
   {
     id: 2,
@@ -68,6 +70,7 @@ const notater = [
     aktørId: '123',
     sakstype: 'PSB',
     skjult: false,
+    kanRedigere: true,
   },
 ];
 
@@ -100,6 +103,7 @@ VisNotatISakPanel.parameters = {
             sakstype: 'PSB',
             versjon: 1,
             skjult: false,
+            kanRedigere: true,
           });
         }
         return res(ctx.status(201));
diff --git a/packages/types/index.ts b/packages/types/index.ts
index 9dce28631d..89e8823067 100644
--- a/packages/types/index.ts
+++ b/packages/types/index.ts
@@ -77,4 +77,6 @@ export type { default as BehandlingStatusType } from './src/totrinnskontroll/Beh
 export type { default as Behandlingsresultat } from './src/totrinnskontroll/Behandlingsresultat';
 export type { default as SimpleEndpoints } from './src/microfrontends/SimpleEndpoints';
 export type { default as SimpleLink } from './src/microfrontends/SimpleLink';
+export { default as NotatGjelderType } from './src/notat-i-sak/NotatGjelderType';
+export type { default as NotatResponse } from './src/notat-i-sak/NotatResponse';
 export * from './src/vilkarUtfallPeriodisert';
diff --git a/packages/types/src/fagsakTsType.ts b/packages/types/src/fagsakTsType.ts
index 082eb7b711..97600f5fd6 100644
--- a/packages/types/src/fagsakTsType.ts
+++ b/packages/types/src/fagsakTsType.ts
@@ -26,6 +26,7 @@ export type Fagsak = Readonly<{
   skalBehandlesAvInfotrygd: boolean;
   dekningsgrad: number;
   erPbSak?: boolean;
+  pleietrengendeAktørId?: string;
 }>;
 
 export default Fagsak;
diff --git a/packages/sak-notat/src/types/NotatGjelderType.ts b/packages/types/src/notat-i-sak/NotatGjelderType.ts
similarity index 66%
rename from packages/sak-notat/src/types/NotatGjelderType.ts
rename to packages/types/src/notat-i-sak/NotatGjelderType.ts
index 66cd569555..e1952e622e 100644
--- a/packages/sak-notat/src/types/NotatGjelderType.ts
+++ b/packages/types/src/notat-i-sak/NotatGjelderType.ts
@@ -1,5 +1,7 @@
 // eslint-disable-next-line import/prefer-default-export
-export enum NotatGjelderType {
+enum NotatGjelderType {
   fagsak = 'FAGSAK',
   pleietrengende = 'PLEIETRENGENDE',
 }
+
+export default NotatGjelderType;
diff --git a/packages/sak-notat/src/types/NotatResponse.ts b/packages/types/src/notat-i-sak/NotatResponse.ts
similarity index 66%
rename from packages/sak-notat/src/types/NotatResponse.ts
rename to packages/types/src/notat-i-sak/NotatResponse.ts
index 56b5f43d3d..00ad0ad93a 100644
--- a/packages/sak-notat/src/types/NotatResponse.ts
+++ b/packages/types/src/notat-i-sak/NotatResponse.ts
@@ -1,6 +1,6 @@
-import { NotatGjelderType } from './NotatGjelderType';
+import NotatGjelderType from './NotatGjelderType';
 
-export interface NotatResponse {
+interface NotatResponse {
   endretAv: string;
   endretTidspunkt: null;
   gjelderType: { kode: NotatGjelderType; navn: string };
@@ -11,4 +11,7 @@ export interface NotatResponse {
   sakstype?: string;
   skjult: boolean;
   versjon: number;
+  kanRedigere: boolean;
 }
+
+export default NotatResponse;
diff --git a/yarn.lock b/yarn.lock
index d3e7552559..d854d708ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5622,6 +5622,7 @@ __metadata:
   resolution: "@k9-sak-web/sak-notat@workspace:packages/sak-notat"
   dependencies:
     "@fpsak-frontend/utils": 1.0.0
+    "@k9-sak-web/rest-api": 1.0.0
     "@k9-sak-web/types": 1.0.0
     "@navikt/aksel-icons": 5.8.0
     "@navikt/ds-react": 5.8.0