diff --git a/src/Nethermind/Nethermind.Consensus/Producers/PayloadAttributes.cs b/src/Nethermind/Nethermind.Consensus/Producers/PayloadAttributes.cs
index 2d9a72fb65c1..3f2f83d337ad 100644
--- a/src/Nethermind/Nethermind.Consensus/Producers/PayloadAttributes.cs
+++ b/src/Nethermind/Nethermind.Consensus/Producers/PayloadAttributes.cs
@@ -147,6 +147,11 @@ private static PayloadAttributesValidationResult ValidateVersion(
             }
 
             error = $"{methodName}{apiVersion} expected";
+            if (apiVersion == EngineApiVersions.Shanghai)
+            {
+                return PayloadAttributesValidationResult.InvalidPayloadAttributes;
+            }
+
             return actualVersion <= EngineApiVersions.Paris ? PayloadAttributesValidationResult.InvalidParams : PayloadAttributesValidationResult.InvalidPayloadAttributes;
         }
 
@@ -154,6 +159,11 @@ private static PayloadAttributesValidationResult ValidateVersion(
         if (timestampVersion != apiVersion)
         {
             error = $"{methodName}{timestampVersion} expected";
+            if (apiVersion == EngineApiVersions.Shanghai)
+            {
+                return PayloadAttributesValidationResult.InvalidPayloadAttributes;
+            }
+
             return timestampVersion <= EngineApiVersions.Paris ? PayloadAttributesValidationResult.InvalidParams : PayloadAttributesValidationResult.UnsupportedFork;
         }
 
diff --git a/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V2.cs b/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V2.cs
index e7901f566b62..cc047415d406 100644
--- a/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V2.cs
+++ b/src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V2.cs
@@ -635,13 +635,13 @@ int ErrorCode
             "{0}V2 expected",
             null,
             "0x6817d4b48be0bc14f144cc242cdc47a5ccc40de34b9c3934acad45057369f576",
-            ErrorCodes.InvalidParams);
+            MergeErrorCodes.InvalidPayloadAttributes);
         yield return (
             London.Instance,
             "{0}V1 expected",
             Array.Empty<Withdrawal>(),
             "0xaa4aa15951a28e6adab430a795e36a84649bbafb1257eda23e38b9131cbd3b98",
-            ErrorCodes.InvalidParams);
+            MergeErrorCodes.InvalidPayloadAttributes);
     }
 
     [TestCaseSource(nameof(ZeroWithdrawalsTestCases))]