diff --git a/Shared.EventStore/Aggregate/AggregateService.cs b/Shared.EventStore/Aggregate/AggregateService.cs
index 9bbd1fe8..7b6b44a7 100644
--- a/Shared.EventStore/Aggregate/AggregateService.cs
+++ b/Shared.EventStore/Aggregate/AggregateService.cs
@@ -136,23 +136,19 @@ public async Task<Result<TAggregate>> Get<TAggregate>(Guid aggregateId,
             {
                 return Result.Success(cachedAggregate);
             }
-            else
+
+            // Not found in cache so call GetLatest
+            SimpleResults.Result<TAggregate> aggregateResult = this.GetLatest<TAggregate>(aggregateId, cancellationToken).Result;
+
+            if (aggregateResult.IsSuccess)
             {
-                // Not found in cache so call GetLatest
-                SimpleResults.Result<TAggregate> aggregateResult = this.GetLatest<TAggregate>(aggregateId, cancellationToken).Result;
-
-                if (aggregateResult.IsSuccess)
-                {
-                    aggregate = aggregateResult.Data;
-                    this.SetCache<TAggregate>(at, aggregateResult.Data);
-                    return Result.Success(aggregate);
-                }
-                else
-                {
-                    Logger.Logger.LogWarning($"aggregateResult failed {aggregateResult.Message}");
-                    return aggregateResult;
-                }
+                aggregate = aggregateResult.Data;
+                this.SetCache<TAggregate>(at, aggregateResult.Data);
+                return Result.Success(aggregate);
             }
+
+            Logger.Logger.LogWarning($"aggregateResult failed {aggregateResult.Message}");
+            return aggregateResult;
         }
         finally
         {
diff --git a/Shared.Tests/ResultHelpersTests.cs b/Shared.Tests/ResultHelpersTests.cs
index f66174e5..c8a5db51 100644
--- a/Shared.Tests/ResultHelpersTests.cs
+++ b/Shared.Tests/ResultHelpersTests.cs
@@ -185,16 +185,15 @@ private Result CreateTestResult(ResultStatus status,
                 ResultStatus.Forbidden => Result.Forbidden(message),
             };
         }
-        else {
-            return status switch {
-                ResultStatus.Invalid => Result.Invalid(errors),
-                ResultStatus.NotFound => Result.NotFound(errors),
-                ResultStatus.Unauthorized => Result.Unauthorized(errors),
-                ResultStatus.Conflict => Result.Conflict(errors),
-                ResultStatus.Failure => Result.Failure(errors),
-                ResultStatus.CriticalError => Result.CriticalError(errors),
-                ResultStatus.Forbidden => Result.Forbidden(errors)
-            };
-        }
+
+        return status switch {
+            ResultStatus.Invalid => Result.Invalid(errors),
+            ResultStatus.NotFound => Result.NotFound(errors),
+            ResultStatus.Unauthorized => Result.Unauthorized(errors),
+            ResultStatus.Conflict => Result.Conflict(errors),
+            ResultStatus.Failure => Result.Failure(errors),
+            ResultStatus.CriticalError => Result.CriticalError(errors),
+            ResultStatus.Forbidden => Result.Forbidden(errors)
+        };
     }
 }
\ No newline at end of file