diff --git a/routes/_components/profile/AccountProfileDetails.html b/routes/_components/profile/AccountProfileDetails.html
index 7f7a9e3b..1072c94f 100644
--- a/routes/_components/profile/AccountProfileDetails.html
+++ b/routes/_components/profile/AccountProfileDetails.html
@@ -23,14 +23,17 @@
       {{numFollowersDisplay}}
     </span>
   </div>
-  <div class="account-profile-more-options">
-    <IconButton
-      label="More options"
-      href="#fa-bars"
-      muted="true"
-      on:click="onMoreOptionsClick()"
-    />
-  </div>
+  <!-- TODO: re-enable this when we support profile editing -->
+  {{#if account && verifyCredentials && account.id !== verifyCredentials.id}}
+    <div class="account-profile-more-options">
+      <IconButton
+        label="More options"
+        href="#fa-bars"
+        muted="true"
+        on:click="onMoreOptionsClick()"
+      />
+    </div>
+  {{/if}}
 </div>
 <style>
   .account-profile-details {
diff --git a/routes/_components/profile/AccountProfileFollow.html b/routes/_components/profile/AccountProfileFollow.html
index ea49a4f0..9e663041 100644
--- a/routes/_components/profile/AccountProfileFollow.html
+++ b/routes/_components/profile/AccountProfileFollow.html
@@ -62,7 +62,7 @@
         }
         return relationship && relationship.following
       },
-      blocking: (relationship) => relationship.blocking,
+      blocking: (relationship) => relationship && relationship.blocking,
       followRequested: (relationship, account) => {
         return relationship && relationship.requested && account && account.locked
       },