diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36487ff..3834555 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+## [0.6.3] - 2024-04-07
+
+### Fixed
+
+- Fix main thread issue
+
 ## [0.6.2] - 2024-03-04
 
 ### Fixed
@@ -295,7 +301,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 - First release candidate of SysFlow Collector.
 
-[Unreleased]: https://github.com/sysflow-telemetry/sf-collector/compare/0.6.2...HEAD
+[Unreleased]: https://github.com/sysflow-telemetry/sf-collector/compare/0.6.3...HEAD
+[0.6.3]: https://github.com/sysflow-telemetry/sf-collector/compare/0.6.2...0.6.3
 [0.6.2]: https://github.com/sysflow-telemetry/sf-collector/compare/0.6.1...0.6.2
 [0.6.1]: https://github.com/sysflow-telemetry/sf-collector/compare/0.6.0...0.6.1
 [0.6.0]: https://github.com/sysflow-telemetry/sf-collector/compare/0.5.1...0.6.0
diff --git a/README.md b/README.md
index 6b2e164..528b35d 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 # Supported tags and respective `Dockerfile` links
 
--	[`0.6.2`, `latest`](https://github.com/sysflow-telemetry/sf-collector/blob/0.6.2/Dockerfile), [`edge`](https://github.com/sysflow-telemetry/sf-collector/blob/master/Dockerfile), [`dev`](https://github.com/sysflow-telemetry/sf-collector/blob/dev/Dockerfile)
+-	[`0.6.3`, `latest`](https://github.com/sysflow-telemetry/sf-collector/blob/0.6.3/Dockerfile), [`edge`](https://github.com/sysflow-telemetry/sf-collector/blob/master/Dockerfile), [`dev`](https://github.com/sysflow-telemetry/sf-collector/blob/dev/Dockerfile)
 
 # Quick reference
 
@@ -26,7 +26,7 @@
 	[docker hub](https://hub.docker.com/u/sysflowtelemetry) | [GHCR](https://github.com/orgs/sysflow-telemetry/packages)
 
 -	**Binary packages**:
-	[deb](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.6.2/sfcollector-0.6.2-x86_64.deb) | [rpm](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.6.2/sfcollector-0.6.2-x86_64.rpm) | [tgz](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.6.2/sfcollector-0.6.2-x86_64.tar.gz)
+	[deb](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.6.3/sfcollector-0.6.3-x86_64.deb) | [rpm](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.6.3/sfcollector-0.6.3-x86_64.rpm) | [tgz](https://github.com/sysflow-telemetry/sf-collector/releases/tag/0.6.3/sfcollector-0.6.3-x86_64.tar.gz)
 
 # What is SysFlow?
 
diff --git a/makefile.manifest.inc b/makefile.manifest.inc
index ca8f6d6..dd1cf24 100644
--- a/makefile.manifest.inc
+++ b/makefile.manifest.inc
@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SYSFLOW_VERSION?=0.6.2
+SYSFLOW_VERSION?=0.6.3
 SYSFLOW_BUILD_NUMBER?=1
 FALCO_VERSION=0.36.2
 FALCO_LIBS_VERSION=0.13.4
diff --git a/src/libs/processcontext.cpp b/src/libs/processcontext.cpp
index 5b264eb..f42e291 100644
--- a/src/libs/processcontext.cpp
+++ b/src/libs/processcontext.cpp
@@ -259,7 +259,7 @@ ProcessObj *ProcessContext::getProcess(sinsp_evt *ev, SFObjectState state,
   mt = mt->get_parent_thread();
 
   while (mt != nullptr && mt->m_tid != -1) {
-    if (mt->is_main_thread()) {
+    if (!mt->is_main_thread()) {
       sinsp_threadinfo *tmp = mt->get_main_thread();
       if (tmp != nullptr) {
         mt = tmp;