diff --git a/cmd/admin-handlers-users.go b/cmd/admin-handlers-users.go
index e8759009a..03ba4ceda 100644
--- a/cmd/admin-handlers-users.go
+++ b/cmd/admin-handlers-users.go
@@ -1904,9 +1904,6 @@ func (a adminAPIHandlers) DetachPolicyBuiltin(w http.ResponseWriter, r *http.Req
 				return
 			}
 		}
-
-		// Return successful JSON response
-		writeSuccessNoContent(w)
 	}
 
 	userType := regUser
@@ -1968,6 +1965,9 @@ func (a adminAPIHandlers) DetachPolicyBuiltin(w http.ResponseWriter, r *http.Req
 		writeErrorResponseJSON(ctx, w, toAdminAPIErr(ctx, err), r.URL)
 		return
 	}
+
+	// Return successful JSON response
+	writeSuccessNoContent(w)
 }
 
 const (