diff --git a/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingManager.cs b/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingManager.cs
index 96f2f5648e..00b0a89e31 100644
--- a/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingManager.cs
+++ b/src/Volo.Abp.Settings/Volo/Abp/Settings/ISettingManager.cs
@@ -8,14 +8,14 @@ namespace Volo.Abp.Settings
     {
         Task<string> GetOrNullAsync([NotNull]string name);
 
-        Task<string> GetOrNullAsync([NotNull]string name, [NotNull] string entityType, string entityId, bool fallback = true);
+        Task<string> GetOrNullAsync([NotNull]string name, [NotNull] string entityType, [CanBeNull] string entityId, bool fallback = true);
 
         Task<List<SettingValue>> GetAllAsync();
 
-        Task<List<SettingValue>> GetAllAsync([NotNull] string entityType, string entityId, bool fallback = true);
+        Task<List<SettingValue>> GetAllAsync([NotNull] string entityType, [CanBeNull] string entityId, bool fallback = true);
 
         Task SetAsync([NotNull] string name, string value, bool forceToSet = false);
 
-        Task SetAsync([NotNull] string name, string value, [NotNull] string entityType, string entityId, bool forceToSet = false);
+        Task SetAsync([NotNull] string name, string value, [NotNull] string entityType, [CanBeNull] string entityId, bool forceToSet = false);
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs b/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs
index 5daf45266a..db7cf2f7da 100644
--- a/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs
+++ b/src/Volo.Abp.Settings/Volo/Abp/Settings/SettingManager.cs
@@ -87,7 +87,7 @@ namespace Volo.Abp.Settings
 
         public Task<List<SettingValue>> GetAllAsync()
         {
-            return GetAllAsync(null, null);
+            throw new System.NotImplementedException();
         }
 
         public Task<List<SettingValue>> GetAllAsync(string entityType, string entityId, bool fallback = true)