diff --git a/safari/Universal/MainConfig.xcconfig b/safari/Universal/MainConfig.xcconfig
index 0952e1d..3f70e1c 100644
--- a/safari/Universal/MainConfig.xcconfig
+++ b/safari/Universal/MainConfig.xcconfig
@@ -1,3 +1,3 @@
-MARKETING_VERSION = 2.2.0
-CURRENT_PROJECT_VERSION = 21 // this needs to be increased with each version change as well (not set to 1 when version is updated)
+MARKETING_VERSION = 2.2.1
+CURRENT_PROJECT_VERSION = 22 // this needs to be increased with each version change as well (not set to 1 when version is updated)
 PRODUCT_NAME = Kagi for Safari
diff --git a/safari/Universal/Shared (Extension)/Resources/background.js b/safari/Universal/Shared (Extension)/Resources/background.js
index f184d2b..7e6a3b1 100644
--- a/safari/Universal/Shared (Extension)/Resources/background.js	
+++ b/safari/Universal/Shared (Extension)/Resources/background.js	
@@ -315,7 +315,9 @@ function captureQuery(a) {
     var b = a.host;
     b.startsWith(www) && (b = b.slice(www.length));
     b.endsWith(yahoo) && (b = yahoo);
-    if (b in builtInEngines && (a = (new URLSearchParams(a.search)).get(builtInEngines[b]))) return a;
+    const path = a.pathname;
+    var shouldBlockGoogleNonSearch = (b in googleUrls && !(path.startsWith("/search")));
+    if (b in builtInEngines && !(shouldBlockGoogleNonSearch) && (a = (new URLSearchParams(a.search)).get(builtInEngines[b]))) return a;
 }
 
 function rewriteQueryURL(a, b) {