diff --git a/index.html b/index.html
index 608a3209..775dcf32 100644
--- a/index.html
+++ b/index.html
@@ -7,8 +7,13 @@
     <meta name="og:site_name" content="chatcraft.org" />
     <meta property="og:image" content="https://chatcraft.org/favicon-32x32.png" />
     <meta property="og:url" content="https://chatcraft.org" />
+    <meta property="og:type" content="website" />
     <meta property="og:title" content="chatcraft.org" />
     <meta property="og:description" content="Web-based AI Assistant for Software Developers" />
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:title" content="chatcraft.org" />
+    <meta name="twitter:description" content="Web-based AI Assistant for Software Developers" />
+    <meta name="twitter:image" content="https://chatcraft.org/favicon-32x32.png" />
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
     <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
diff --git a/src/lib/share.ts b/src/lib/share.ts
index 5b95fcc9..161c7897 100644
--- a/src/lib/share.ts
+++ b/src/lib/share.ts
@@ -59,7 +59,18 @@ function generateSharingHTML(chat: ChatCraftChat, user: User) {
   // Set various types of titles/summaries
   setMetaContent(clonedDocument, "property", "og:title", chat.summary);
   setMetaContent(clonedDocument, "property", "og:url", createShareUrl(chat, user));
+  setMetaContent(clonedDocument, "property", "og:type", "website");
   setMetaContent(clonedDocument, "name", "description", chat.summary);
+  setMetaContent(clonedDocument, "name", "twitter:card", "summary_large_image");
+  setMetaContent(clonedDocument, "name", "twitter:title", "chatcraft.org");
+  setMetaContent(clonedDocument, "name", "twitter:description", chat.summary);
+  setMetaContent(
+    clonedDocument,
+    "name",
+    "twitter:image",
+    "https://chatcraft.org/favicon-32x32.png"
+  );
+
   setDocumentTitle(clonedDocument, chat.summary);
   // Set OG bulk text to be that of last message
   if (lastMessageText) {