diff --git a/Wave/Components/Layout/NavMenu.razor b/Wave/Components/Layout/NavMenu.razor
index 1bb8a6b..17d2d83 100644
--- a/Wave/Components/Layout/NavMenu.razor
+++ b/Wave/Components/Layout/NavMenu.razor
@@ -57,12 +57,7 @@
             </ul>
             <AuthorizeView>
                 @if (context.User.FindFirst(ClaimTypes.NameIdentifier)?.Value is { } id) {
-                    <div class="avatar">
-                        <div class="w-8 rounded">
-                            <img src="/api/user/pfp/@id" alt="" loading="lazy"
-                                 onerror="this.remove()" />
-                        </div>
-                    </div>
+                    <ProfilePictureComponent ProfileId="@id" />
                 }
             </AuthorizeView>
 		</div>
diff --git a/Wave/Components/ProfilePictureComponent.razor b/Wave/Components/ProfilePictureComponent.razor
new file mode 100644
index 0000000..5238532
--- /dev/null
+++ b/Wave/Components/ProfilePictureComponent.razor
@@ -0,0 +1,11 @@
+<div class="avatar">
+    <div class="w-8 rounded">
+        <img src="/api/user/pfp/@ProfileId" alt="" loading="lazy"
+             onerror="this.remove()" />
+    </div>
+</div>
+
+@code {
+    [Parameter] 
+    public string ProfileId { get; set; } = string.Empty;
+}