diff --git a/internal/config/config.go b/internal/config/config.go
index 62ec0dc862..daf1c5463a 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -179,7 +179,7 @@ func (c *Config) ToFakeGcsOptions(scheme string) fakestorage.Options {
 		}
 	}
 	port := c.Port
-	if c.Scheme == "both" && scheme == "http" {
+	if scheme == "http" {
 		port = c.PortHTTP
 	}
 	logger := logrus.New()
diff --git a/main.go b/main.go
index b7bb040c14..58d26964e6 100644
--- a/main.go
+++ b/main.go
@@ -60,12 +60,14 @@ func startServer(logger *logrus.Logger, cfg *config.Config) {
 		opts     *fakestorage.Options
 	}
 
-	listenersAndOpts := make([]listenerAndOpts, 2)
+	var listenersAndOpts []listenerAndOpts
 
 	if cfg.Scheme != "both" {
+		listenersAndOpts = make([]listenerAndOpts, 1)
 		listener, opts := createListener(logger, cfg, cfg.Scheme)
 		listenersAndOpts[0] = listenerAndOpts{listener, opts}
 	} else {
+		listenersAndOpts = make([]listenerAndOpts, 2)
 		listener, opts := createListener(logger, cfg, "http")
 		listenersAndOpts[0] = listenerAndOpts{listener, opts}
 		listener, opts = createListener(logger, cfg, "https")
@@ -74,7 +76,7 @@ func startServer(logger *logrus.Logger, cfg *config.Config) {
 
 	addMimeTypes()
 
-	httpServer, err := fakestorage.NewServerWithOptions(*listenersAndOpts[1].opts)
+	httpServer, err := fakestorage.NewServerWithOptions(*listenersAndOpts[0].opts)
 	if err != nil {
 		logger.WithError(err).Fatal("couldn't start the server")
 	}