diff --git a/internal/handler/podesavanja.go b/internal/handler/podesavanja.go
index 0b59291..3210e47 100644
--- a/internal/handler/podesavanja.go
+++ b/internal/handler/podesavanja.go
@@ -912,12 +912,15 @@ func (h *Handler) TestFiskalizacije(w http.ResponseWriter, r *http.Request) {
 	if _, ok := h.zahtevajDozvolu(w, r, "podesavanja.pregled"); !ok {
 		return
 	}
-	podesavanja, err := ntechsqlite.DohvatiSvaPodesavanja(r.Context(), h.DB)
-	if err != nil {
-		http.Error(w, "Greška", http.StatusInternalServerError)
-		return
+	pfrURL := strings.TrimSpace(r.FormValue("pfr_url"))
+	if pfrURL == "" {
+		podesavanja, err := ntechsqlite.DohvatiSvaPodesavanja(r.Context(), h.DB)
+		if err != nil {
+			http.Error(w, "Greška", http.StatusInternalServerError)
+			return
+		}
+		pfrURL = vrednostIliDefault(podesavanja, "pfr_url", "http://127.0.0.1:4566")
 	}
-	pfrURL := vrednostIliDefault(podesavanja, "pfr_url", "http://127.0.0.1:4566")
 
 	klijent := &http.Client{Timeout: 5 * time.Second}
 	resp, err := klijent.Get(pfrURL + "/api/status")
diff --git a/web/templates/stranice/podesavanja_fiskalizacija.html b/web/templates/stranice/podesavanja_fiskalizacija.html
index e331a42..779f877 100644
--- a/web/templates/stranice/podesavanja_fiskalizacija.html
+++ b/web/templates/stranice/podesavanja_fiskalizacija.html
@@ -43,6 +43,7 @@
                     </button>
                     <button type="button"
                         hx-get="/podesavanja/fiskalizacija/test"
+                        hx-include="#pfr_url"
                         hx-target="#fisk-test-rezultat"
                         hx-swap="innerHTML"
                         hx-indicator="#fisk-test-spinner"