diff --git a/src/MSAAdvanced.sol b/src/MSAAdvanced.sol
index 9f324f3..e1c0774 100644
--- a/src/MSAAdvanced.sol
+++ b/src/MSAAdvanced.sol
@@ -149,7 +149,7 @@ contract MSAAdvanced is IMSA, ExecutionHelper, ModuleManager, HookManager {
     )
         external
         payable
-        onlyEntryPointOrSelf
+        onlyEntryPoint
     {
         bytes calldata callData = userOp.callData[4:];
         (bool success,) = address(this).delegatecall(callData);
diff --git a/src/MSABasic.sol b/src/MSABasic.sol
index 5a9b6b0..5896045 100644
--- a/src/MSABasic.sol
+++ b/src/MSABasic.sol
@@ -89,7 +89,7 @@ contract MSABasic is IMSA, ExecutionHelper, ModuleManager {
     )
         external
         payable
-        onlyEntryPointOrSelf
+        onlyEntryPoint
     {
         bytes calldata callData = userOp.callData[4:];
         (bool success,) = address(this).delegatecall(callData);
diff --git a/src/core/AccountBase.sol b/src/core/AccountBase.sol
index 0bfd3ef..cd96618 100644
--- a/src/core/AccountBase.sol
+++ b/src/core/AccountBase.sol
@@ -11,6 +11,7 @@ contract AccountBase {
     /////////////////////////////////////////////////////
     // Access Control
     ////////////////////////////////////////////////////
+
     modifier onlyEntryPointOrSelf() virtual {
         if (!(msg.sender == entryPoint() || msg.sender == address(this))) {
             revert AccountAccessUnauthorized();