diff --git a/src/components/Setup/index.tsx b/src/components/Setup/index.tsx
index 8a747c6f1..8a3d9e664 100644
--- a/src/components/Setup/index.tsx
+++ b/src/components/Setup/index.tsx
@@ -133,10 +133,6 @@ const Setup = () => {
         setCurrentStep(3);
       }
     }
-
-    if (currentStep === 3) {
-      validateLibraries();
-    }
   }, [
     settings.currentSettings.mediaServerType,
     settings.currentSettings.initialized,
@@ -148,6 +144,13 @@ const Setup = () => {
     validateLibraries,
   ]);
 
+  useEffect(() => {
+    if (currentStep === 3) {
+      validateLibraries();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [currentStep]);
+
   const handleComplete = () => {
     validateLibraries();
   };