diff --git a/components/engine/registry/session.go b/components/engine/registry/session.go
index dd868a2b35..f7358bc102 100644
--- a/components/engine/registry/session.go
+++ b/components/engine/registry/session.go
@@ -54,7 +54,7 @@ func NewSession(authConfig *cliconfig.AuthConfig, factory *requestdecorator.Requ
 		if err != nil {
 			return nil, err
 		}
-		if info.Standalone {
+		if info.Standalone && authConfig != nil && factory != nil {
 			logrus.Debugf("Endpoint %s is eligible for private registry. Enabling decorator.", r.indexEndpoint.String())
 			dec := requestdecorator.NewAuthDecorator(authConfig.Username, authConfig.Password)
 			factory.AddDecorator(dec)