diff --git a/packages/bpk-component-drawer/src/BpkDrawer.tsx b/packages/bpk-component-drawer/src/BpkDrawer.tsx
index c3e50cf55c..8de0afbdf9 100644
--- a/packages/bpk-component-drawer/src/BpkDrawer.tsx
+++ b/packages/bpk-component-drawer/src/BpkDrawer.tsx
@@ -89,7 +89,8 @@ const BpkDrawer = ({
           dialogRef={dialogRef}
           closeLabel={closeLabel || ""}
           closeText={closeText}
-          additionalClassName={className}
+          // eslint-disable-next-line @skyscanner/rules/forbid-component-props
+          className={className}
           contentClassName={contentClassName}
           getApplicationElement={getApplicationElement}
           hideTitle={hideTitle}
diff --git a/packages/bpk-component-drawer/src/BpkDrawerContent.module.scss b/packages/bpk-component-drawer/src/BpkDrawerContent.module.scss
index 46e04351d3..b5df9e6ef0 100644
--- a/packages/bpk-component-drawer/src/BpkDrawerContent.module.scss
+++ b/packages/bpk-component-drawer/src/BpkDrawerContent.module.scss
@@ -80,8 +80,6 @@
     justify-content: space-between;
     align-items: center;
     flex: 0 0;
-
-    @include borders.bpk-border-bottom-sm(tokens.$bpk-line-day);
   }
 
   &__heading {
diff --git a/packages/bpk-component-drawer/src/BpkDrawerContent.tsx b/packages/bpk-component-drawer/src/BpkDrawerContent.tsx
index 6cbd861156..00aedca1f9 100644
--- a/packages/bpk-component-drawer/src/BpkDrawerContent.tsx
+++ b/packages/bpk-component-drawer/src/BpkDrawerContent.tsx
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import type { ReactNode } from 'react';
+import type { ReactNode, RefObject } from 'react';
 
 import { Transition } from 'react-transition-group';
 
@@ -34,12 +34,12 @@ const getClassName = cssModules(STYLES);
 
 type Props = {
   children: ReactNode,
-  dialogRef: () => React.RefObject<HTMLElement>,
+  dialogRef: () => RefObject<HTMLElement>,
   onCloseAnimationComplete: () => void,
   onClose: () => void
   id: string,
   title: string,
-  className?: string,
+  className?: string | null,
   contentClassName?: string,
   closeLabel?: string,
   closeText?: string,