diff --git a/README.md b/README.md
index 8ba97c8c..77457dfd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=v3.6.0&x2=0)](https://github.com/Praqma/helmsman/releases) [![CircleCI](https://circleci.com/gh/Praqma/helmsman/tree/master.svg?style=svg)](https://circleci.com/gh/Praqma/helmsman/tree/master)
+[![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=v3.6.1&x2=0)](https://github.com/Praqma/helmsman/releases) [![CircleCI](https://circleci.com/gh/Praqma/helmsman/tree/master.svg?style=svg)](https://circleci.com/gh/Praqma/helmsman/tree/master)
 
 ![helmsman-logo](docs/images/helmsman.png)
 
diff --git a/internal/app/main.go b/internal/app/main.go
index cd1ef8b3..bc2a77f9 100644
--- a/internal/app/main.go
+++ b/internal/app/main.go
@@ -7,7 +7,7 @@ import (
 
 const (
 	helmBin            = "helm"
-	appVersion         = "v3.6.0"
+	appVersion         = "v3.6.1"
 	tempFilesDir       = ".helmsman-tmp"
 	defaultContextName = "default"
 	resourcePool       = 10
diff --git a/internal/app/state.go b/internal/app/state.go
index 72fa0f7d..9d587f11 100644
--- a/internal/app/state.go
+++ b/internal/app/state.go
@@ -308,6 +308,9 @@ func (s *state) disableUntargetedApps(groups, targets []string) {
 		}
 	}
 
+	if s.Namespaces == nil || len(s.Namespaces) == 0 {
+		return
+	}
 	for nsName, ns := range s.Namespaces {
 		if _, ok := namespaces[nsName]; !ok {
 			ns.Disable()
diff --git a/release-notes.md b/release-notes.md
index 833b6fff..73fdb5c8 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,16 +1,10 @@
-# v3.6.0
+# v3.6.1
 
 If you migrating from Helmsman v1.x, it is recommended you read the [migration guide](https://github.com/Praqma/helmsman/blob/master/docs/how_to/misc/migrate_to_3.md) before using this release.
 
 > Starting from Helmsman v3.0.0 GA release, support for Helmsman v1.x will be limited to bug fixes.
 
-## New features
-
-- Lifecycle hooks can now be shell commands or script in addition to k8s resources (#543)
-- The Helm release secrets are annotated with the result from the lifecycle hooks
-
 ## Fixes and improvements
 
-- Code cleanup
-- Performance improvements (#543; #545; #547)
-- Fixed a bug when the chart is renamed (#546)
+- Fixed NPE when no config is passed to the NSs (#551)
+- Fixed wrong detection of executable hook (#549)