diff --git a/src/interface/desktop/main.js b/src/interface/desktop/main.js
index db206065..06585c55 100644
--- a/src/interface/desktop/main.js
+++ b/src/interface/desktop/main.js
@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain, Tray, Menu, nativeImage, shell } = require('electron');
+const { app, BrowserWindow, ipcMain, Tray, Menu, nativeImage, shell, session } = require('electron');
 const todesktop = require("@todesktop/runtime");
 const khojPackage = require('./package.json');
 
@@ -401,6 +401,33 @@ async function getUserInfo() {
     }
 }
 
+function addCSPHeaderToSession () {
+    // Get hostURL from store or use default
+    const hostURL = store.get('hostURL') || KHOJ_URL;
+
+    // Construct Content Security Policy
+    const defaultDomains = `'self' ${hostURL} https://app.khoj.dev https://assets.khoj.dev`;
+    const default_src = `default-src ${defaultDomains};`;
+    const script_src = `script-src ${defaultDomains} 'unsafe-inline';`;
+    const connect_src = `connect-src ${hostURL} https://ipapi.co/json;`;
+    const style_src = `style-src ${defaultDomains} 'unsafe-inline' https://fonts.googleapis.com;`;
+    const img_src = `img-src ${defaultDomains} data: https://*.khoj.dev https://*.googleusercontent.com;`;
+    const font_src = `font-src https://fonts.gstatic.com;`;
+    const child_src = `child-src 'none';`;
+    const objectSrc = `object-src 'none';`;
+    const csp = `${default_src} ${script_src} ${connect_src} ${style_src} ${img_src} ${font_src} ${child_src} ${objectSrc}`;
+
+    // Add Content Security Policy to all web requests
+    session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
+        callback({
+            responseHeaders: {
+                ...details.responseHeaders,
+                'Content-Security-Policy': [csp]
+            }
+        })
+    })
+ }
+
 let firstRun = true;
 let win = null;
 let titleBarStyle = process.platform === 'win32' ? 'default' : 'hidden';
@@ -480,6 +507,8 @@ const createWindow = (tab = 'chat.html') => {
 }
 
 app.whenReady().then(() => {
+    addCSPHeaderToSession();
+
     ipcMain.on('set-title', handleSetTitle);
 
     ipcMain.handle('handleFileOpen', (event, type) => {
diff --git a/src/interface/obsidian/src/chat_view.ts b/src/interface/obsidian/src/chat_view.ts
index c4b92026..b884d78b 100644
--- a/src/interface/obsidian/src/chat_view.ts
+++ b/src/interface/obsidian/src/chat_view.ts
@@ -80,6 +80,20 @@ export class KhojChatView extends KhojPaneView {
 
         super.onOpen();
 
+        // Construct Content Security Policy
+        let defaultDomains = `'self' ${this.setting.khojUrl} https://app.khoj.dev https://assets.khoj.dev`;
+        const defaultSrc = `default-src ${defaultDomains};`;
+        const scriptSrc = `script-src ${defaultDomains} 'unsafe-inline';`;
+        const connectSrc = `connect-src ${this.setting.khojUrl} https://ipapi.co/json;`;
+        const styleSrc = `style-src ${defaultDomains} 'unsafe-inline';`;
+        const imgSrc = `img-src ${defaultDomains} data: https://*.khoj.dev https://*.googleusercontent.com;`;
+        const childSrc = `child-src 'none';`;
+        const objectSrc = `object-src 'none';`;
+        const csp = `${defaultSrc} ${scriptSrc} ${connectSrc} ${styleSrc} ${imgSrc} ${childSrc} ${objectSrc}`;
+
+        // Add CSP meta tag to the Khoj Chat modal
+        document.head.createEl("meta", { attr: { "http-equiv": "Content-Security-Policy", "content": `${csp}` } });
+
         // Create area for chat logs
         let chatBodyEl = contentEl.createDiv({ attr: { id: "khoj-chat-body", class: "khoj-chat-body" } });
 
diff --git a/src/khoj/interface/web/chat.html b/src/khoj/interface/web/chat.html
index 826355a6..d8f35f05 100644
--- a/src/khoj/interface/web/chat.html
+++ b/src/khoj/interface/web/chat.html
@@ -4,6 +4,15 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0">
         <meta property="og:image" content="https://assets.khoj.dev/khoj_hero.png">
+        <meta http-equiv="Content-Security-Policy"
+              content="default-src 'self' https://assets.khoj.dev;
+                       script-src 'self' https://assets.khoj.dev 'unsafe-inline';
+                       connect-src 'self' https://ipapi.co/json;
+                       style-src 'self' https://assets.khoj.dev 'unsafe-inline' https://fonts.googleapis.com;
+                       img-src 'self' data: https://*.khoj.dev https://*.googleusercontent.com;
+                       font-src https://assets.khoj.dev https://fonts.gstatic.com;
+                       child-src 'none';
+                       object-src 'none';">
         <title>Khoj - Chat</title>
 
         <link rel="stylesheet" href="/static/assets/khoj.css?v={{ khoj_version }}">