diff --git a/cmd/admin-handlers.go b/cmd/admin-handlers.go
index a4605fac9..63a3928b7 100644
--- a/cmd/admin-handlers.go
+++ b/cmd/admin-handlers.go
@@ -36,8 +36,8 @@ func (adminAPI adminAPIHandlers) ServiceStatusHandler(w http.ResponseWriter, r *
 	if err != nil {
 		writeErrorResponseNoHeader(w, r, ErrInternalError, r.URL.Path)
 		errorIf(err, "Failed to marshal storage info into json.")
+		return
 	}
-	w.WriteHeader(http.StatusOK)
 	writeSuccessResponse(w, jsonBytes)
 }