diff --git a/apps/workspace-engine/pkg/workspace/releasemanager/policy/evaluator/deploymentwindow/getters.go b/apps/workspace-engine/pkg/workspace/releasemanager/policy/evaluator/deploymentwindow/getters.go
index d9f20baed..e2d76b336 100644
--- a/apps/workspace-engine/pkg/workspace/releasemanager/policy/evaluator/deploymentwindow/getters.go
+++ b/apps/workspace-engine/pkg/workspace/releasemanager/policy/evaluator/deploymentwindow/getters.go
@@ -22,7 +22,10 @@ type StoreGetters struct {
 
 func (s *StoreGetters) HasCurrentRelease(ctx context.Context, releaseTarget *oapi.ReleaseTarget) (bool, error) {
 	_, _, err := s.store.ReleaseTargets.GetCurrentRelease(ctx, releaseTarget)
-	return err == nil, err
+	if err != nil {
+		return false, nil
+	}
+	return true, nil
 }
 
 var _ Getters = (*PostgresGetters)(nil)
diff --git a/apps/workspace-engine/pkg/workspace/releasemanager/policy/evaluator/gradualrollout/getters.go b/apps/workspace-engine/pkg/workspace/releasemanager/policy/evaluator/gradualrollout/getters.go
index 11d3582e1..b2fb64d27 100644
--- a/apps/workspace-engine/pkg/workspace/releasemanager/policy/evaluator/gradualrollout/getters.go
+++ b/apps/workspace-engine/pkg/workspace/releasemanager/policy/evaluator/gradualrollout/getters.go
@@ -57,7 +57,10 @@ func (s *StoreGetters) GetPolicySkips(versionID, environmentID, resourceID strin
 
 func (s *StoreGetters) HasCurrentRelease(ctx context.Context, releaseTarget *oapi.ReleaseTarget) (bool, error) {
 	_, _, err := s.store.ReleaseTargets.GetCurrentRelease(ctx, releaseTarget)
-	return err == nil, err
+	if err != nil {
+		return false, nil
+	}
+	return true, nil
 }
 
 func (s *StoreGetters) GetReleaseTargets() ([]*oapi.ReleaseTarget, error) {