diff --git a/src/DotNetCore.CAP.PostgreSql/IStorageInitializer.PostgreSql.cs b/src/DotNetCore.CAP.PostgreSql/IStorageInitializer.PostgreSql.cs
index 966aa6b9..bf875fc0 100644
--- a/src/DotNetCore.CAP.PostgreSql/IStorageInitializer.PostgreSql.cs
+++ b/src/DotNetCore.CAP.PostgreSql/IStorageInitializer.PostgreSql.cs
@@ -77,6 +77,7 @@ protected virtual string CreateDbTablesScript(string schema)
 );
 
 CREATE INDEX IF NOT EXISTS ""idx_received_ExpiresAt_StatusName"" ON {GetReceivedTableName()} (""ExpiresAt"",""StatusName"");
+CREATE INDEX IF NOT EXISTS ""idx_received_Version_ExpiresAt_StatusName"" ON {GetReceivedTableName()} (""Version"",""ExpiresAt"",""StatusName"");
 
 CREATE TABLE IF NOT EXISTS {GetPublishedTableName()}(
 	""Id"" BIGINT PRIMARY KEY NOT NULL,
@@ -90,22 +91,8 @@ protected virtual string CreateDbTablesScript(string schema)
 );
 
 CREATE INDEX IF NOT EXISTS ""idx_published_ExpiresAt_StatusName"" ON {GetPublishedTableName()}(""ExpiresAt"",""StatusName"");
+CREATE INDEX IF NOT EXISTS ""idx_published_Version_ExpiresAt_StatusName"" ON {GetPublishedTableName()} (""Version"",""ExpiresAt"",""StatusName"");";
 
-DO $$
-DECLARE
-    major_version INT;
-BEGIN
-    SELECT split_part(current_setting('server_version'), '.', 1)::int INTO major_version;
-
-    IF major_version >= 11 THEN
-        CREATE INDEX IF NOT EXISTS ""idx_received_Version_ExpiresAt_StatusName"" ON {GetReceivedTableName()} (""Version"",""ExpiresAt"",""StatusName"") INCLUDE (""Id"", ""Content"", ""Retries"", ""Added"");
-        CREATE INDEX IF NOT EXISTS ""idx_published_Version_ExpiresAt_StatusName"" ON {GetPublishedTableName()} (""Version"",""ExpiresAt"",""StatusName"") INCLUDE (""Id"", ""Content"", ""Retries"", ""Added"");
-    ELSE
-       CREATE INDEX IF NOT EXISTS ""idx_received_Version_ExpiresAt_StatusName"" ON {GetReceivedTableName()} (""Version"",""ExpiresAt"",""StatusName"");
-       CREATE INDEX IF NOT EXISTS ""idx_published_Version_ExpiresAt_StatusName"" ON {GetPublishedTableName()} (""Version"",""ExpiresAt"",""StatusName"");
-    END IF;
-END $$;
-";
         if (_capOptions.Value.UseStorageLock)
             batchSql += $@"
 CREATE TABLE IF NOT EXISTS {GetLockTableName()}(