diff --git a/background.html b/background.html
index 045cbdad8..28aaadb9f 100644
--- a/background.html
+++ b/background.html
@@ -659,7 +659,6 @@
   <script type='text/javascript' src='js/models/messages.js'></script>
   <script type='text/javascript' src='js/models/conversations.js'></script>
   <script type='text/javascript' src='js/models/blockedNumbers.js'></script>
-  <script type='text/javascript' src='js/models/profile.js'></script>
   <script type='text/javascript' src='js/expiring_messages.js'></script>
 
   <script type='text/javascript' src='js/chromium.js'></script>
diff --git a/test/index.html b/test/index.html
index 5ebafa95f..9c7524a88 100644
--- a/test/index.html
+++ b/test/index.html
@@ -530,7 +530,6 @@
   <script type="text/javascript" src="../js/libloki.js" data-cover></script>
 
   <script type="text/javascript" src="../js/libphonenumber-util.js"></script>
-  <script type='text/javascript' src='../js/models/profile.js' data-cover></script>
   <script type="text/javascript" src="../js/models/messages.js" data-cover></script>
   <script type="text/javascript" src="../js/models/conversations.js" data-cover></script>
   <script type="text/javascript" src="../js/models/blockedNumbers.js" data-cover></script>
diff --git a/ts/components/conversation/MessageDetail.tsx b/ts/components/conversation/MessageDetail.tsx
index 91baec0ce..1a18a780a 100644
--- a/ts/components/conversation/MessageDetail.tsx
+++ b/ts/components/conversation/MessageDetail.tsx
@@ -57,14 +57,16 @@ export class MessageDetail extends React.Component<Props> {
     const { i18n, message } = this.props;
 
     return (
-      <div className="module-message-detail__delete-button-container">
-        <button
-          onClick={message.onDelete}
-          className="module-message-detail__delete-button"
-        >
-          {i18n('deleteThisMessage')}
-        </button>
-      </div>
+      message.isDeletable ? (
+        <div className="module-message-detail__delete-button-container">
+          <button
+            onClick={message.onDelete}
+            className="module-message-detail__delete-button"
+          >
+            {i18n('deleteThisMessage')}
+          </button>
+        </div>
+      ) : null
     );
   }