diff --git a/render/templates/views/entry.tmpl b/render/templates/views/entry.tmpl
index c38f27c..2561eb8 100644
--- a/render/templates/views/entry.tmpl
+++ b/render/templates/views/entry.tmpl
@@ -42,6 +42,16 @@
 <br>
 <hr>
 <br>
+<form method="post" action="/editor/unpublish/{{.Entry.ID}}/" class="grid">
+    <label for="confirm">
+        Confirm unpublishing
+        <input type="checkbox" name="confirm" id="confirm" required />
+    </label>
+    <input type="submit" class="secondary outline" value="Unpublish" />
+</form>
+<br>
+<hr>
+<br>
 <form method="post" action="/editor/delete/{{.Entry.ID}}/" class="grid">
     <label for="confirm">
         Confirm deletion
diff --git a/web/app.go b/web/app.go
index 83cb70d..f70b6d0 100644
--- a/web/app.go
+++ b/web/app.go
@@ -70,6 +70,7 @@ func NewWebApp(
 	editor.Get("/edit/:id/", editorHandler.HandleGetEdit)
 	editor.Post("/edit/:id/", editorHandler.HandlePostEdit)
 	editor.Post("/delete/:id/", editorHandler.HandlePostDelete)
+	editor.Post("/unpublish/:id/", editorHandler.HandlePostUnpublish)
 
 	// SiteConfig
 	siteConfig := app.Group("/site-config")
diff --git a/web/editor_handler.go b/web/editor_handler.go
index 9733875..d41cbc7 100644
--- a/web/editor_handler.go
+++ b/web/editor_handler.go
@@ -148,3 +148,19 @@ func (h *EditorHandler) HandlePostDelete(c *fiber.Ctx) error {
 	}
 	return c.Redirect("/")
 }
+
+func (h *EditorHandler) HandlePostUnpublish(c *fiber.Ctx) error {
+	c.Set(fiber.HeaderContentType, fiber.MIMETextHTML)
+
+	id := c.Params("id")
+	entry, err := h.entrySvc.FindById(id)
+	if err != nil {
+		return err
+	}
+	entry.SetPublishedAt(nil)
+	err = h.entrySvc.Update(entry)
+	if err != nil {
+		return err
+	}
+	return c.Redirect("/posts/" + entry.ID() + "/")
+}
diff --git a/web/entry_handler.go b/web/entry_handler.go
index 509daef..c6c26f2 100644
--- a/web/entry_handler.go
+++ b/web/entry_handler.go
@@ -45,6 +45,10 @@ func (h *EntryHandler) Handle(c *fiber.Ctx) error {
 		return err
 	}
 
+	if entry.PublishedAt() == nil || entry.PublishedAt().IsZero() {
+		return fiber.NewError(fiber.StatusNotFound, "Entry not found")
+	}
+
 	author, err := h.authorSvc.FindByName(entry.AuthorId())
 	if err != nil {
 		author = &model.Author{}