diff --git a/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m b/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
index 19f2743..e53f5b2 100644
--- a/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
+++ b/MVMCore/MVMCore/PresentationHandling/MVMCoreNavigationOperation.m
@@ -206,12 +206,17 @@
 
 - (void)markAsFinished {
     self.navigationObject.navigationController.delegate = nil;
+    if (self.navigationObject.stopLoadingOverlay) {
+        [[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:YES];
+        self.navigationObject.stopLoadingOverlay = NO;
+    }
     [super markAsFinished];
 }
 
 - (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
     if (self.navigationObject.stopLoadingOverlay) {
         [[MVMCoreLoadingOverlayHandler sharedLoadingOverlay] stopLoading:YES];
+        self.navigationObject.stopLoadingOverlay = NO;
     }
 
     if (self.delegate && [self.delegate respondsToSelector:@selector(navigationController:willDisplayViewController:)]) {
@@ -225,7 +230,6 @@
         [self.delegate navigationController:navigationController displayedViewController:viewController];
     }
     [self markAsFinished];
-    
 }
 
 - (nullable id <UIViewControllerAnimatedTransitioning>)navigationController:(UINavigationController *)navigationController animationControllerForOperation:(UINavigationControllerOperation)operation fromViewController:(UIViewController *)fromVC toViewController:(UIViewController *)toVC {