diff --git a/src/components/Repositories/Repository.jsx b/src/components/Repositories/Repository.jsx
index f3f6f7e2..e19525ce 100644
--- a/src/components/Repositories/Repository.jsx
+++ b/src/components/Repositories/Repository.jsx
@@ -136,9 +136,11 @@ const Repository = ({ name, links, readme }) => (
                 object
             } = repo
 
-            const readmeHtml = remark()
-                .use(remarkReact)
-                .processSync(object.text).contents
+            const readmeHtml = object
+                ? remark()
+                      .use(remarkReact)
+                      .processSync(object.text).contents
+                : null
 
             return (
                 <article className={styles.repository}>
@@ -155,7 +157,7 @@ const Repository = ({ name, links, readme }) => (
                         />
                     </footer>
 
-                    {readme && (
+                    {readme && object && (
                         <aside className={styles.repositoryReadme}>
                             <h3 className={styles.repositoryReadmeTitle}>
                                 README.md
diff --git a/src/components/Repositories/Repository.module.scss b/src/components/Repositories/Repository.module.scss
index 9049bb93..4769ed8c 100644
--- a/src/components/Repositories/Repository.module.scss
+++ b/src/components/Repositories/Repository.module.scss
@@ -89,7 +89,9 @@
 }
 
 .repositoryReadme {
-    margin-top: $spacer;
+    margin-top: $spacer / $line-height;
+    padding: $spacer / 2;
+    background: darken($brand-white, 2%);
 
     h1,
     h2 {
@@ -104,9 +106,9 @@
 
 .repositoryReadmeTitle {
     font-size: $font-size-small !important; // stylelint-disable-line
+    font-family: $font-family-monospace;
+    font-weight: $font-weight-base;
     margin: 0;
     color: $brand-grey-light;
     margin-bottom: $spacer / 2;
-    padding-bottom: $spacer / 3;
-    border-bottom: 1px solid $brand-grey-lighter;
 }