diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index ceb8c8b5a..0a6ac0ad0 100644
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -98,7 +98,6 @@ def restrict_unauthenticated_access?(resource, kind) do
 
   def improved_hashtag_timeline_path, do: [:instance, :improved_hashtag_timeline]
   def improved_hashtag_timeline, do: get(improved_hashtag_timeline_path())
-  def object_embedded_hashtags?, do: !improved_hashtag_timeline()
 
   def oauth_consumer_strategies, do: get([:auth, :oauth_consumer_strategies], [])
 
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 9b5c1bec1..9edf43e04 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -388,24 +388,16 @@ def tags(%Object{data: %{"tag" => tags}}) when is_list(tags), do: tags
   def tags(_), do: []
 
   def hashtags(%Object{} = object) do
-    cond do
-      Config.object_embedded_hashtags?() ->
-        embedded_hashtags(object)
-
-      object.id == "pleroma:fake_object_id" ->
-        []
-
-      true ->
-        hashtag_records = Repo.preload(object, :hashtags).hashtags
-        Enum.map(hashtag_records, & &1.name)
-    end
+    # Note: always using embedded hashtags regardless whether they are migrated to hashtags table
+    #   (embedded hashtags stay in sync anyways, and we avoid extra joins and preload hassle)
+    embedded_hashtags(object)
   end
 
-  defp embedded_hashtags(%Object{data: data}) do
+  def embedded_hashtags(%Object{data: data}) do
     object_data_hashtags(data)
   end
 
-  defp embedded_hashtags(_), do: []
+  def embedded_hashtags(_), do: []
 
   def object_data_hashtags(%{"tag" => tags}) when is_list(tags) do
     tags