diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go
index 12f90cd092..a97ed8d40f 100644
--- a/modules/setting/lfs.go
+++ b/modules/setting/lfs.go
@@ -77,15 +77,12 @@ func loadLFSFrom(rootCfg ConfigProvider) error {
 		return nil
 	}
 
-	// TODO: #11024 check nil because settings loaded twice
-	if LFS.SigningKey == nil {
-		keyCfg, err := loadKeyCfg(rootCfg, "server", "LFS_JWT_", "HS256", "lfs/private.pem")
-		if err == nil {
-			LFS.SigningKey, err = jwtx.InitSigningKey(&keyCfg.Signing)
-		}
-		if err != nil {
-			return fmt.Errorf("lfs key initialization failed: %v", err)
-		}
+	keyCfg, err := loadKeyCfg(rootCfg, "server", "LFS_JWT_", "HS256", "lfs/private.pem")
+	if err == nil {
+		LFS.SigningKey, err = jwtx.InitSigningKey(&keyCfg.Signing)
+	}
+	if err != nil {
+		return fmt.Errorf("lfs key initialization failed: %v", err)
 	}
 
 	return nil
diff --git a/services/lfs/server_test.go b/services/lfs/server_test.go
index 67c93f30bb..065387ce08 100644
--- a/services/lfs/server_test.go
+++ b/services/lfs/server_test.go
@@ -105,8 +105,6 @@ var cfgVariants = []namedCfg{
 }
 
 func TestAuthenticate(t *testing.T) {
-	// TODO: #11024
-	setting.InstallLock = true
 	for _, v := range cfgVariants {
 		cfg := iniCommon + v.cfg
 		t.Run(v.name, func(t *testing.T) { testAuthenticate(t, cfg) })