diff --git a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c
index 5bff073bc5..b91e62e1a8 100644
--- a/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c
+++ b/ArmPkg/Drivers/GenericWatchdogDxe/GenericWatchdogDxe.c
@@ -391,6 +391,8 @@ GenericWatchdogEntry (
     goto UnregisterHandler;
   }
 
+  WatchdogDisable ();
+
   // Install the Timer Architectural Protocol onto a new handle
   Handle = NULL;
   Status = gBS->InstallMultipleProtocolInterfaces (
@@ -413,8 +415,6 @@ GenericWatchdogEntry (
                   );
   ASSERT_EFI_ERROR (Status);
 
-  WatchdogDisable ();
-
   return EFI_SUCCESS;
 
 UnregisterHandler: