diff --git a/PiHelper/PiHoleDataStore.swift b/PiHelper/PiHoleDataStore.swift
index d2da550..6838636 100644
--- a/PiHelper/PiHoleDataStore.swift
+++ b/PiHelper/PiHoleDataStore.swift
@@ -190,14 +190,13 @@ class PiHoleDataStore: ObservableObject {
             .sink(receiveCompletion: { (completion) in
                 switch completion {
                 case .finished:
-                    if let completionBlock = completionBlock {
-                        completionBlock()
-                    }
                     self.currentRequest = nil
-                    return
                 case .failure(let error):
                     self.pihole = .failure(.networkError(self.oldPiHole, error: error))
                 }
+                if let completionBlock = completionBlock {
+                    completionBlock()
+                }
             }, receiveValue: { pihole in
                 UIApplication.shared.shortcutItems = [
                     UIApplicationShortcutItem(