diff --git a/Wave/Components/Pages/ArticleView.razor b/Wave/Components/Pages/ArticleView.razor
index bb7770b..1856c51 100644
--- a/Wave/Components/Pages/ArticleView.razor
+++ b/Wave/Components/Pages/ArticleView.razor
@@ -4,6 +4,7 @@
 @using Wave.Data
 @using System.Security.Claims
 @using System.Globalization
+@using System.Net
 @using Microsoft.AspNetCore.Identity
 @using Microsoft.Extensions.Options
 @using Wave.Services
@@ -181,6 +182,10 @@
 				a.PublishDate.Date == date.Date 
 				&& (slug != null && a.Slug == slug || a.Title.ToLower() == title));
 		}
+
+		if (Article is null) {
+			HttpContext.Response.StatusCode = (int)HttpStatusCode.NotFound;
+		}
 	}
 
 	protected override async Task OnInitializedAsync() {