diff --git a/src/Cutout/Cutout.js b/src/Cutout/Cutout.js
index eaa18b87..c0585c29 100644
--- a/src/Cutout/Cutout.js
+++ b/src/Cutout/Cutout.js
@@ -31,7 +31,8 @@ export const StyledCutout = styled.div`
     border-bottom-color: ${({ theme }) => theme.borderLight};
 
     pointer-events: none;
-    ${props => props.shadow && `box-shadow:${insetShadow};`}
+    ${props =>
+      props.theme.shadow && props.shadow && `box-shadow:${insetShadow};`}
   }
 `;
 
diff --git a/src/common/index.js b/src/common/index.js
index 1ab65ee1..fa148cc4 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -64,8 +64,9 @@ export const createBorderStyles = ({
         border-top-color: ${({ theme }) => theme.borderDarkest};
         border-right-color: ${({ theme }) => theme.borderLightest};
         border-bottom-color: ${({ theme }) => theme.borderLightest};
-        box-shadow: ${props => props.shadow && `${shadow}, `} inset 1px 1px 0px
-            1px ${({ theme }) => theme.borderDark},
+        box-shadow: ${props =>
+              props.theme.shadow && props.shadow && `${shadow}, `}
+            inset 1px 1px 0px 1px ${({ theme }) => theme.borderDark},
           inset -1px -1px 0 1px ${({ theme }) => theme.borderLight};
       `
     : css`
@@ -77,8 +78,9 @@ export const createBorderStyles = ({
           windowBorders ? theme.borderLight : theme.borderLightest};
         border-right-color: ${({ theme }) => theme.borderDarkest};
         border-bottom-color: ${({ theme }) => theme.borderDarkest};
-        box-shadow: ${props => props.shadow && `${shadow}, `} inset 1px 1px 0px
-            1px
+        box-shadow: ${props =>
+              props.theme.shadow && props.shadow && `${shadow}, `}
+            inset 1px 1px 0px 1px
             ${({ theme }) =>
               windowBorders ? theme.borderLightest : theme.borderLight},
           inset -1px -1px 0 1px ${({ theme }) => theme.borderDark};