diff --git a/doc/100-General/10-Changelog.md b/doc/100-General/10-Changelog.md
index 592437d9..0d2157ff 100644
--- a/doc/100-General/10-Changelog.md
+++ b/doc/100-General/10-Changelog.md
@@ -11,14 +11,15 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
 
 [Issues and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/44)
 
-### Enhancements
-
-* [#865](https://github.com/Icinga/icinga-powershell-framework/pull/865) Adds support for MSSQL shared memory feature, by not using a port for the connection string by using 0 or lower as port number
-
 ### Bugfixes
 
+* [#873](https://github.com/Icinga/icinga-powershell-framework/issues/873) Fixes `StackOverflowException` while using `-ThresholdInterval` if no Metrics over Time are present [@bewshy]
 * [#877](https://github.com/Icinga/icinga-powershell-framework/pull/877) Fixes threshold comparison while using `%`-Values, which caused falsely report of `Warning` threshold being larger than `Critical` threshold
 
+### Enhancements
+
+* [#865](https://github.com/Icinga/icinga-powershell-framework/pull/865) Adds support for MSSQL shared memory feature, by not using a port for the connection string by using 0 or lower as port number
+
 ## 1.14.2 (2026-03-31)
 
 [Issues and PRs](https://github.com/Icinga/icinga-powershell-framework/milestone/44)
diff --git a/lib/icinga/plugin/New-IcingaCheck.psm1 b/lib/icinga/plugin/New-IcingaCheck.psm1
index 14702afa..1b71aa8d 100644
--- a/lib/icinga/plugin/New-IcingaCheck.psm1
+++ b/lib/icinga/plugin/New-IcingaCheck.psm1
@@ -529,10 +529,11 @@ function New-IcingaCheck()
         param ($ThresholdObject, $State);
 
         if ($ThresholdObject.HasError) {
-            $this.SetUnknown() | Out-Null;
-            $this.__ThresholdObject = $ThresholdObject;
-            $this.__FixedState = $TRUE;
-            $this.__SetCheckOutput($this.__ThresholdObject.Message);
+	        $this.__HandleAsNoticeObject = $FALSE;
+            $this.__ThresholdObject      = $ThresholdObject;
+            $this.__CheckState           = $IcingaEnums.IcingaExitCode.Unknown;
+	        $this.__FixedState           = $TRUE;
+	        $this.__SetCheckOutput($this.__ThresholdObject.Message);
             $this.__LockState();
             return;
         }