diff --git a/.github/workflows/governance-checks.yaml b/.github/workflows/governance-checks.yaml
index aaa50ea3708..1c563bf1c84 100644
--- a/.github/workflows/governance-checks.yaml
+++ b/.github/workflows/governance-checks.yaml
@@ -27,7 +27,6 @@ jobs:
             GOVERNOR_ADDRESS: '0x323A76393544d5ecca80cd6ef2A560C6a395b7E3'
           - DAO_NAME: 'Hop'
             GOVERNOR_ADDRESS: '0xed8Bdb5895B8B7f9Fdb3C087628FD8410E853D48'
-          
 
     name: Check all live proposals
     runs-on: ubuntu-latest
diff --git a/checks/check-targets-no-selfdestruct.ts b/checks/check-targets-no-selfdestruct.ts
new file mode 100644
index 00000000000..aec340b10ce
--- /dev/null
+++ b/checks/check-targets-no-selfdestruct.ts
@@ -0,0 +1,111 @@
+import { JsonRpcProvider } from '@ethersproject/providers'
+import { bullet, toAddressLink } from '../presentation/report'
+import { ProposalCheck } from '../types'
+
+/**
+ * Check all targets with code if they contain selfdestruct.
+ */
+export const checkTargetsNoSelfdestruct: ProposalCheck = {
+  name: 'Check all targets do not contain selfdestruct',
+  async checkProposal(proposal, sim, deps) {
+    const uniqueTargets = proposal.targets.filter((addr, i, targets) => targets.indexOf(addr) === i)
+    const { info, warn, error } = await checkNoSelfdestructs(
+      [deps.governor.address, deps.timelock.address],
+      uniqueTargets,
+      deps.provider
+    )
+    return { info, warnings: warn, errors: error }
+  },
+}
+
+/**
+ * Check all touched contracts with code if they contain selfdestruct.
+ */
+export const checkTouchedContractsNoSelfdestruct: ProposalCheck = {
+  name: 'Check all touched contracts do not contain selfdestruct',
+  async checkProposal(proposal, sim, deps) {
+    const { info, warn, error } = await checkNoSelfdestructs(
+      [deps.governor.address, deps.timelock.address],
+      sim.transaction.addresses,
+      deps.provider
+    )
+    return { info, warnings: warn, errors: error }
+  },
+}
+
+/**
+ * For a given simulation response, check if a set of addresses contain selfdestruct.
+ */
+async function checkNoSelfdestructs(
+  trustedAddrs: string[],
+  addresses: string[],
+  provider: JsonRpcProvider
+): Promise<{ info: string[]; warn: string[]; error: string[] }> {
+  const info: string[] = []
+  const warn: string[] = []
+  const error: string[] = []
+  for (const addr of addresses) {
+    const status = await checkNoSelfdestruct(trustedAddrs, addr, provider)
+    const address = toAddressLink(addr, false)
+    if (status === 'eoa') info.push(bullet(`${address}: EOA`))
+    else if (status === 'empty') warn.push(bullet(`${address}: EOA (may have code later)`))
+    else if (status === 'safe') info.push(bullet(`${address}: Contract (looks safe)`))
+    else if (status === 'delegatecall') warn.push(bullet(`${address}: Contract (with DELEGATECALL)`))
+    else if (status === 'trusted') info.push(bullet(`${address}: Trusted contract (not checked)`))
+    else error.push(bullet(`${address}: Contract (with SELFDESTRUCT)`))
+  }
+  return { info, warn, error }
+}
+
+const STOP = 0x00
+const JUMPDEST = 0x5b
+const PUSH1 = 0x60
+const PUSH32 = 0x7f
+const RETURN = 0xf3
+const REVERT = 0xfd
+const INVALID = 0xfe
+const SELFDESTRUCT = 0xff
+const DELEGATECALL = 0xf4
+
+const isHalting = (opcode: number): boolean => [STOP, RETURN, REVERT, INVALID, SELFDESTRUCT].includes(opcode)
+const isPUSH = (opcode: number): boolean => opcode >= PUSH1 && opcode <= PUSH32
+
+/**
+ * For a given address, check if it's an EOA, a safe contract, or a contract contain selfdestruct.
+ */
+async function checkNoSelfdestruct(
+  trustedAddrs: string[],
+  addr: string,
+  provider: JsonRpcProvider
+): Promise<'safe' | 'eoa' | 'empty' | 'selfdestruct' | 'delegatecall' | 'trusted'> {
+  if (trustedAddrs.map(addr => addr.toLowerCase()).includes(addr.toLowerCase())) return 'trusted'
+
+  const [code, nonce] = await Promise.all([provider.getCode(addr), provider.getTransactionCount(addr)])
+
+  // If there is no code and nonce is > 0 then it's an EOA.
+  // If nonce is 0 it is an empty account that might have code later.
+  // A contract might have nonce > 0, but then it will have code.
+  // If it had code, but was selfdestructed, the nonce should be reset to 0.
+  if (code === '0x') return nonce > 0 ? 'eoa' : 'empty'
+
+  // Detection logic from https://github.com/MrLuit/selfdestruct-detect
+  const bytecode = Buffer.from(code.substring(2), 'hex')
+  let halted = false
+  let delegatecall = false
+  for (let index = 0; index < bytecode.length; index++) {
+    const opcode = bytecode[index]
+    if (opcode === SELFDESTRUCT && !halted) {
+      return 'selfdestruct'
+    } else if (opcode === DELEGATECALL && !halted) {
+      delegatecall = true
+    } else if (opcode === JUMPDEST) {
+      halted = false
+    } else if (isHalting(opcode)) {
+      halted = true
+    } else if (isPUSH(opcode)) {
+      index += opcode - PUSH1 + 0x01
+    }
+  }
+
+  return delegatecall ? 'delegatecall' : 'safe'
+}
diff --git a/checks/index.ts b/checks/index.ts
index a14f24a0117..b1f3f3c95a3 100644
--- a/checks/index.ts
+++ b/checks/index.ts
@@ -2,6 +2,7 @@ import {
   checkTargetsVerifiedEtherscan,
   checkTouchedContractsVerifiedEtherscan,
 } from './check-targets-verified-etherscan'
+import { checkTargetsNoSelfdestruct, checkTouchedContractsNoSelfdestruct } from './check-targets-no-selfdestruct'
 import { checkDecodeCalldata } from './check-decode-calldata'
 import { checkLogs } from './check-logs'
 import { checkSlither } from './check-slither'
@@ -18,6 +19,8 @@ const ALL_CHECKS: {
   checkLogs,
   checkTargetsVerifiedEtherscan,
   checkTouchedContractsVerifiedEtherscan,
+  checkTargetsNoSelfdestruct,
+  checkTouchedContractsNoSelfdestruct,
   checkValueRequired,
   // The solc check must be run before the slither check, because the compilation exports a zip file
   // which is consumed by slither. This prevents us from having to compile the contracts twice.