diff --git a/footer.php b/footer.php
index 22c56fa..81d5409 100644
--- a/footer.php
+++ b/footer.php
@@ -8,7 +8,11 @@
 
 ?>
 		<footer id="site-footer" class="show">
-			<p>By <a href="/">Ben</a> | <?php if ( ! is_page('Hi.') && ! is_page('privacy-policy') ): ?><a href="https://github.com/Rumperuu/Omphaloskepsis/issues" target="_blank" rel="noopener noreferrer">Report an Issue</a> | <?php endif; ?><a href="/privacy-policy">Privacy Policy</a></p>
+			<p>By <a href="/">Ben</a> | 
+			<?php
+			if ( ! is_page( 'Hi.' ) && ! is_page( 'privacy-policy' ) && ! is_404() ) :
+				?>
+				<a href="https://github.com/Rumperuu/Omphaloskepsis/issues" target="_blank" rel="noopener noreferrer">Report an Issue</a> | <?php endif; ?><a href="/privacy-policy">Privacy Policy</a></p>
 		</footer>
 
 		<script type="text/javascript">
diff --git a/header.php b/header.php
index fc79154..9946d8e 100644
--- a/header.php
+++ b/header.php
@@ -28,7 +28,7 @@
 	</head>
 
 	<body <?php body_class(); ?> id="site-wrapper">
-		<?php if ( ! is_page_template( 'centred-page.php' ) ) : ?>
+		<?php if ( ! is_page_template( 'centred-page.php' ) && ! is_404() ) : ?>
 		<header id="site-header">
 		<nav id="site-header-nav">
 			<div class="site-header-nav-item"><a href="/"><h1>Ben Goldsworthy</a></div>
