diff --git a/add-on/src/popup/browser-action/store.js b/add-on/src/popup/browser-action/store.js
index cc515a8f5..e866bcc8c 100644
--- a/add-on/src/popup/browser-action/store.js
+++ b/add-on/src/popup/browser-action/store.js
@@ -71,7 +71,7 @@ module.exports = (state, emitter) => {
 
     try {
       const ipfs = await getIpfsApi()
-      const currentPath = await resolveToIPFS(ipfs, state.currentTab.url)
+      const currentPath = await resolveToPinPath(ipfs, state.currentTab.url)
       const pinResult = await ipfs.pin.add(currentPath, { recursive: true })
       console.log('ipfs.pin.add result', pinResult)
       state.isPinned = true
@@ -90,7 +90,7 @@ module.exports = (state, emitter) => {
 
     try {
       const ipfs = await getIpfsApi()
-      const currentPath = await resolveToIPFS(ipfs, state.currentTab.url)
+      const currentPath = await resolveToPinPath(ipfs, state.currentTab.url)
       const result = await ipfs.pin.rm(currentPath, { recursive: true })
       state.isPinned = false
       console.log('ipfs.pin.rm result', result)
@@ -244,7 +244,7 @@ module.exports = (state, emitter) => {
     // skip update if there is an ongoing pin or unpin
     if (state.isPinning || state.isUnPinning) return
     try {
-      const currentPath = await resolveToIPFS(ipfs, status.currentTab.url)
+      const currentPath = await resolveToPinPath(ipfs, status.currentTab.url)
       const response = await ipfs.pin.ls(currentPath, { quiet: true })
       console.log(`positive ipfs.pin.ls for ${currentPath}: ${JSON.stringify(response)}`)
       state.isPinned = true
@@ -273,8 +273,11 @@ async function getIpfsApi () {
   return (bg && bg.ipfsCompanion) ? bg.ipfsCompanion.ipfs : null
 }
 
-async function resolveToIPFS (ipfs, urlOrPath) {
-  let path = safeIpfsPath(urlOrPath) // https://github.com/ipfs/ipfs-companion/issues/303
+async function resolveToPinPath (ipfs, url) {
+  // https://github.com/ipfs-shipyard/ipfs-companion/issues/567
+  url = url.split('#')[0].split('?')[0]
+  // https://github.com/ipfs/ipfs-companion/issues/303
+  let path = safeIpfsPath(url)
   if (/^\/ipns/.test(path)) {
     const response = await ipfs.name.resolve(path, { recursive: true, nocache: false })
     // old API returned object, latest one returns string ¯\_(ツ)_/¯