diff --git a/.github/workflows/core-contracts-storage-check.yml b/.github/workflows/core-contracts-storage-check.yml
index a7b2cc2b3..085e4d3bb 100644
--- a/.github/workflows/core-contracts-storage-check.yml
+++ b/.github/workflows/core-contracts-storage-check.yml
@@ -46,6 +46,7 @@ jobs:
   check_storage_layout:
     needs: provide_contracts
     runs-on: ubuntu-latest
+    if: ${{ needs.provide_contracts.outputs.matrix != '[]' && needs.provide_contracts.outputs.matrix != '' }}
 
     strategy:
       matrix:
diff --git a/.github/workflows/diamond-storage-check.yml b/.github/workflows/diamond-storage-check.yml
index e7a4a8466..d4f869098 100644
--- a/.github/workflows/diamond-storage-check.yml
+++ b/.github/workflows/diamond-storage-check.yml
@@ -50,6 +50,7 @@ jobs:
   check_storage_layout:
     needs: provide_contracts
     runs-on: ubuntu-latest
+    if: ${{ needs.provide_contracts.outputs.matrix != '[]' && needs.provide_contracts.outputs.matrix != '' }}
 
     strategy:
       matrix: