diff --git a/changelog.md b/changelog.md
index 2c9486f..071b223 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,7 @@
 # v0.1.18
 - Update deps
 - Fix content not escaping HTML properly
+- Add placeholder for empty notes and contexts
 
 # v0.1.17
 - Fix new invite button not working
diff --git a/lib/memex_web/components/core_components/context_content.html.heex b/lib/memex_web/components/core_components/context_content.html.heex
index 2c210d7..6911543 100644
--- a/lib/memex_web/components/core_components/context_content.html.heex
+++ b/lib/memex_web/components/core_components/context_content.html.heex
@@ -1,8 +1,11 @@
 <div
   :if={@context.content}
   id={"show-context-content-#{@context.id}"}
-  class="input input-primary h-128 min-h-128 inline-block whitespace-pre-wrap overflow-x-hidden overflow-y-auto resize-y"
+  class="inline-block overflow-y-auto overflow-x-hidden whitespace-pre-wrap resize-y input input-primary h-128 min-h-128"
   phx-update="ignore"
   readonly
   phx-no-format
 ><p class="inline"><%= display_links(@context) %></p></div>
+<div :if={!@context.content} class="text-sm italic text-center text-gray-600">
+  <%= gettext("(This context is empty)") %>
+</div>
diff --git a/lib/memex_web/components/core_components/note_content.html.heex b/lib/memex_web/components/core_components/note_content.html.heex
index 04ee1d9..7b2ad2e 100644
--- a/lib/memex_web/components/core_components/note_content.html.heex
+++ b/lib/memex_web/components/core_components/note_content.html.heex
@@ -1,8 +1,11 @@
 <div
   :if={@note.content}
   id={"show-note-content-#{@note.id}"}
-  class="input input-primary h-128 min-h-128 inline-block whitespace-pre-wrap overflow-x-hidden overflow-y-auto resize-y"
+  class="inline-block overflow-y-auto overflow-x-hidden whitespace-pre-wrap resize-y input input-primary h-128 min-h-128"
   phx-update="ignore"
   readonly
   phx-no-format
 ><p class="inline"><%= display_links(@note) %></p></div>
+<div :if={!@note.content} class="text-sm italic text-center text-gray-600">
+  <%= gettext("(This note is empty)") %>
+</div>
diff --git a/lib/memex_web/components/core_components/pipeline_content.html.heex b/lib/memex_web/components/core_components/pipeline_content.html.heex
index 8eabc79..54ac5a0 100644
--- a/lib/memex_web/components/core_components/pipeline_content.html.heex
+++ b/lib/memex_web/components/core_components/pipeline_content.html.heex
@@ -1,7 +1,7 @@
 <div
   :if={@pipeline.description}
   id={"show-pipeline-description-#{@pipeline.id}"}
-  class="input input-primary h-32 min-h-32 inline-block whitespace-pre-wrap overflow-x-hidden overflow-y-auto resize-y"
+  class="inline-block overflow-y-auto overflow-x-hidden h-32 whitespace-pre-wrap resize-y input input-primary min-h-32"
   phx-update="ignore"
   readonly
   phx-no-format
diff --git a/lib/memex_web/components/core_components/step_content.html.heex b/lib/memex_web/components/core_components/step_content.html.heex
index 9801494..708247d 100644
--- a/lib/memex_web/components/core_components/step_content.html.heex
+++ b/lib/memex_web/components/core_components/step_content.html.heex
@@ -1,7 +1,7 @@
 <div
   :if={@step.content}
   id={"show-step-content-#{@step.id}"}
-  class="input input-primary h-32 min-h-32 inline-block whitespace-pre-wrap overflow-x-hidden overflow-y-auto resize-y"
+  class="inline-block overflow-y-auto overflow-x-hidden h-32 whitespace-pre-wrap resize-y input input-primary min-h-32"
   phx-update="ignore"
   readonly
   phx-no-format
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index 146816d..1f306d9 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -711,3 +711,13 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "note, context and pipeline slugs must be unique, and you are free to link to notes not written by you."
 msgstr ""
+
+#: lib/memex_web/components/core_components/context_content.html.heex:10
+#, elixir-autogen, elixir-format
+msgid "(This context is empty)"
+msgstr ""
+
+#: lib/memex_web/components/core_components/note_content.html.heex:10
+#, elixir-autogen, elixir-format
+msgid "(This note is empty)"
+msgstr ""
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index b3d5304..f2a52e0 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -709,3 +709,13 @@ msgstr ""
 #, elixir-autogen, elixir-format
 msgid "note, context and pipeline slugs must be unique, and you are free to link to notes not written by you."
 msgstr ""
+
+#: lib/memex_web/components/core_components/context_content.html.heex:10
+#, elixir-autogen, elixir-format
+msgid "(This context is empty)"
+msgstr ""
+
+#: lib/memex_web/components/core_components/note_content.html.heex:10
+#, elixir-autogen, elixir-format
+msgid "(This note is empty)"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 2b350da..88688ea 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -710,3 +710,13 @@ msgstr ""
 #, elixir-autogen, elixir-format, fuzzy
 msgid "note, context and pipeline slugs must be unique, and you are free to link to notes not written by you."
 msgstr ""
+
+#: lib/memex_web/components/core_components/context_content.html.heex:10
+#, elixir-autogen, elixir-format
+msgid "(This context is empty)"
+msgstr ""
+
+#: lib/memex_web/components/core_components/note_content.html.heex:10
+#, elixir-autogen, elixir-format
+msgid "(This note is empty)"
+msgstr ""