diff --git a/src/app/components/addresses/AddressHeader/AddressHeader.tsx b/src/app/components/addresses/AddressHeader/AddressHeader.tsx
index 6928e23df..e47ca567a 100644
--- a/src/app/components/addresses/AddressHeader/AddressHeader.tsx
+++ b/src/app/components/addresses/AddressHeader/AddressHeader.tsx
@@ -2,7 +2,7 @@ import styled from "styled-components"
 import { breakpoint, themeSpacing, Typography } from "@amsterdam/asc-ui"
 
 import { useBAG } from "app/state/rest"
-import ShowOtherAddressesButton from "app/components/addresses/AddressSuffixSwitcher/ShowOtherAddressesButton"
+import ShowOtherAddressesButton, { Index } from "app/components/addresses/AddressSuffixSwitcher/ShowOtherAddressesButton"
 import useOtherAddressesByBagId from "app/state/rest/custom/useOtherAddresses/useOtherAddresses"
 import AddressLink from "./components/AddressLink"
 import getAddressFromBagResults from "app/components/addresses/utils/getAddressFromBagResults"
@@ -37,10 +37,12 @@ const AddressHeader: React.FC<Props> = ({ bagId, headingSize = "h2", isHeader =
   const showButton = enableSwitch && (filteredAddresses?.length ?? 0) > 1
   const isCurrentAddress = (address: { adres: string }) => address.adres.trim() === foundAddress?.adres.trim()
   const addressIndex = filteredAddresses?.findIndex(isCurrentAddress) ?? -1
-  const index
-    = addressIndex === 0 ? "first"
-      : addressIndex > 0 && addressIndex === (filteredAddresses?.length ?? 0) - 1 ? "last"
-        : undefined
+  let index: Index = undefined
+  if (addressIndex === 0) {
+    index = "first"
+  } else if (addressIndex > 0 && addressIndex === (filteredAddresses?.length ?? 0) - 1) {
+    index = "last"
+  }
 
   // TODO: Show loading status visually
   return (
diff --git a/src/app/components/addresses/AddressSuffixSwitcher/ShowOtherAddressesButton.tsx b/src/app/components/addresses/AddressSuffixSwitcher/ShowOtherAddressesButton.tsx
index 668841999..a6f9ed7db 100644
--- a/src/app/components/addresses/AddressSuffixSwitcher/ShowOtherAddressesButton.tsx
+++ b/src/app/components/addresses/AddressSuffixSwitcher/ShowOtherAddressesButton.tsx
@@ -6,7 +6,7 @@ import { Button, Icon } from "@amsterdam/asc-ui"
 import { useModal } from "app/components/shared/Modal/hooks/useModal"
 import OtherAddressesModal from "./OtherAddressesModal"
 
-type Index = "first" | "last" | undefined
+export type Index = "first" | "last" | undefined
 type Props = {
   bagId: Components.Schemas.Address["bag_id"]
   index: Index
@@ -21,9 +21,9 @@ const StyledIcon = styled(Icon)`
 const renderIcon = (index: Index) => {
   switch(index) {
     case "first":
-      return <StyledIcon size={32}><ExpandMore/></StyledIcon>
+      return <StyledIcon size={ 32 }><ExpandMore/></StyledIcon>
     case "last":
-      return <StyledIcon size={32}><ExpandLess/></StyledIcon>
+      return <StyledIcon size={ 32 }><ExpandLess/></StyledIcon>
     default:
       return <StyledIcon
         size={ 32 }