diff --git a/cmd/drone-server/inject_store.go b/cmd/drone-server/inject_store.go
index 302911c32..73aa05aed 100644
--- a/cmd/drone-server/inject_store.go
+++ b/cmd/drone-server/inject_store.go
@@ -83,9 +83,16 @@ func provideBuildStore(db *db.DB) core.BuildStore {
 func provideLogStore(db *db.DB, config config.Config) core.LogStore {
 	if config.S3.Bucket == "" && config.AzureBlob.ContainerName == "" {
 		return logs.New(db)
-	}
-	s := logs.New(db)
-	if config.S3.Bucket != "" {
+	} else if config.AzureBlob.ContainerName != "" {
+		s := logs.New(db)
+		p := logs.NewAzureBlobEnv(
+			config.AzureBlob.ContainerName,
+			config.AzureBlob.StorageAccountName,
+			config.AzureBlob.StorageAccessKey,
+		)
+		return logs.NewCombined(p, s)
+	} else {
+		s := logs.New(db)
 		p := logs.NewS3Env(
 			config.S3.Bucket,
 			config.S3.Prefix,
@@ -94,15 +101,6 @@ func provideLogStore(db *db.DB, config config.Config) core.LogStore {
 		)
 		return logs.NewCombined(p, s)
 	}
-
-	if config.AzureBlob.ContainerName != "" {
-		p := logs.NewAzureBlobEnv(
-			config.AzureBlob.ContainerName,
-			config.AzureBlob.StorageAccountName,
-			config.AzureBlob.StorageAccessKey,
-		)
-		return logs.NewCombined(p, s)
-	}
 }
 
 // provideStageStore is a Wire provider function that provides a