diff --git a/Iceshrimp.Backend/Pages/Note.cshtml.cs b/Iceshrimp.Backend/Pages/Note.cshtml.cs
index 99ee95eb..921bd77f 100644
--- a/Iceshrimp.Backend/Pages/Note.cshtml.cs
+++ b/Iceshrimp.Backend/Pages/Note.cshtml.cs
@@ -26,7 +26,7 @@ public class NoteModel(
public string? QuoteUrl;
public bool ShowMedia = security.Value.PublicPreview > Enums.PublicPreview.RestrictedNoMedia;
public bool ShowRemoteReplies = security.Value.PublicPreview > Enums.PublicPreview.Restricted;
- public string InstanceName = await meta.Get(MetaEntity.InstanceName) ?? "Iceshrimp.NET";
+ public string InstanceName = "Iceshrimp.NET";
public Dictionary TextContent = new();
@@ -42,6 +42,8 @@ public class NoteModel(
throw GracefulException.Forbidden("Public preview is disabled on this instance.",
"The instance administrator has intentionally disabled this feature for privacy reasons.");
+ InstanceName = await meta.Get(MetaEntity.InstanceName) ?? InstanceName;
+
//TODO: redirect to login (with route as url param) when public preview is disabled
//TODO: login button
//TODO: thread view (respect public preview settings - don't show remote replies if set to restricted or lower)
diff --git a/Iceshrimp.Backend/Pages/User.cshtml.cs b/Iceshrimp.Backend/Pages/User.cshtml.cs
index 322d380f..0e4cc787 100644
--- a/Iceshrimp.Backend/Pages/User.cshtml.cs
+++ b/Iceshrimp.Backend/Pages/User.cshtml.cs
@@ -24,7 +24,7 @@ public class UserModel(
public new User? User;
public string? Bio;
public bool ShowMedia = security.Value.PublicPreview > Enums.PublicPreview.RestrictedNoMedia;
- public string InstanceName = await meta.Get(MetaEntity.InstanceName) ?? "Iceshrimp.NET";
+ public string InstanceName = "Iceshrimp.NET";
[SuppressMessage("ReSharper", "EntityFramework.NPlusOne.IncompleteDataQuery",
Justification = "IncludeCommonProperties")]
@@ -38,6 +38,8 @@ public class UserModel(
throw GracefulException.Forbidden("Public preview is disabled on this instance.",
"The instance administrator has intentionally disabled this feature for privacy reasons.");
+ InstanceName = await meta.Get(MetaEntity.InstanceName) ?? InstanceName;
+
//TODO: login button
//TODO: user note view (respect public preview settings - don't show renotes of remote notes if set to restricted or lower)
//TODO: emoji