diff --git a/Emby.Dlna/Api/DlnaService.cs b/Emby.Dlna/Api/DlnaService.cs
deleted file mode 100644
index 5f984bb335..0000000000
--- a/Emby.Dlna/Api/DlnaService.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-#pragma warning disable CS1591
-
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Services;
-
-namespace Emby.Dlna.Api
-{
-    [Route("/Dlna/ProfileInfos", "GET", Summary = "Gets a list of profiles")]
-    public class GetProfileInfos : IReturn<DeviceProfileInfo[]>
-    {
-    }
-
-    [Route("/Dlna/Profiles/{Id}", "DELETE", Summary = "Deletes a profile")]
-    public class DeleteProfile : IReturnVoid
-    {
-        [ApiMember(Name = "Id", Description = "Profile Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
-        public string Id { get; set; }
-    }
-
-    [Route("/Dlna/Profiles/Default", "GET", Summary = "Gets the default profile")]
-    public class GetDefaultProfile : IReturn<DeviceProfile>
-    {
-    }
-
-    [Route("/Dlna/Profiles/{Id}", "GET", Summary = "Gets a single profile")]
-    public class GetProfile : IReturn<DeviceProfile>
-    {
-        [ApiMember(Name = "Id", Description = "Profile Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
-        public string Id { get; set; }
-    }
-
-    [Route("/Dlna/Profiles/{Id}", "POST", Summary = "Updates a profile")]
-    public class UpdateProfile : DeviceProfile, IReturnVoid
-    {
-    }
-
-    [Route("/Dlna/Profiles", "POST", Summary = "Creates a profile")]
-    public class CreateProfile : DeviceProfile, IReturnVoid
-    {
-    }
-
-    [Authenticated(Roles = "Admin")]
-    public class DlnaService : IService
-    {
-        private readonly IDlnaManager _dlnaManager;
-
-        public DlnaService(IDlnaManager dlnaManager)
-        {
-            _dlnaManager = dlnaManager;
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
-        public object Get(GetProfileInfos request)
-        {
-            return _dlnaManager.GetProfileInfos().ToArray();
-        }
-
-        public object Get(GetProfile request)
-        {
-            return _dlnaManager.GetProfile(request.Id);
-        }
-
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
-        public object Get(GetDefaultProfile request)
-        {
-            return _dlnaManager.GetDefaultProfile();
-        }
-
-        public void Delete(DeleteProfile request)
-        {
-            _dlnaManager.DeleteProfile(request.Id);
-        }
-
-        public void Post(UpdateProfile request)
-        {
-            _dlnaManager.UpdateProfile(request);
-        }
-
-        public void Post(CreateProfile request)
-        {
-            _dlnaManager.CreateProfile(request);
-        }
-    }
-}
diff --git a/Jellyfin.Api/Controllers/DlnaController.cs b/Jellyfin.Api/Controllers/DlnaController.cs
new file mode 100644
index 0000000000..68cd144f4e
--- /dev/null
+++ b/Jellyfin.Api/Controllers/DlnaController.cs
@@ -0,0 +1,124 @@
+#nullable enable
+
+using System.Collections.Generic;
+using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Model.Dlna;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Jellyfin.Api.Controllers
+{
+    /// <summary>
+    /// Dlna Controller.
+    /// </summary>
+    [Authenticated(Roles = "Admin")]
+    public class DlnaController : BaseJellyfinApiController
+    {
+        private readonly IDlnaManager _dlnaManager;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DlnaController"/> class.
+        /// </summary>
+        /// <param name="dlnaManager">Instance of the <see cref="IDlnaManager"/> interface.</param>
+        public DlnaController(IDlnaManager dlnaManager)
+        {
+            _dlnaManager = dlnaManager;
+        }
+
+        /// <summary>
+        /// Get profile infos.
+        /// </summary>
+        /// <returns>Profile infos.</returns>
+        [HttpGet("ProfileInfos")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public IEnumerable<DeviceProfileInfo> GetProfileInfos()
+        {
+            return _dlnaManager.GetProfileInfos();
+        }
+
+        /// <summary>
+        /// Gets the default profile.
+        /// </summary>
+        /// <returns>Default profile.</returns>
+        [HttpGet("Profiles/Default")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public ActionResult<DeviceProfileInfo> GetDefaultProfile()
+        {
+            return Ok(_dlnaManager.GetDefaultProfile());
+        }
+
+        /// <summary>
+        /// Gets a single profile.
+        /// </summary>
+        /// <param name="id">Profile Id.</param>
+        /// <returns>Profile.</returns>
+        [HttpGet("Profiles/{Id}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult<DeviceProfileInfo> GetProfile([FromRoute] string id)
+        {
+            var profile = _dlnaManager.GetProfile(id);
+            if (profile == null)
+            {
+                return NotFound();
+            }
+
+            return Ok(profile);
+        }
+
+        /// <summary>
+        /// Deletes a profile.
+        /// </summary>
+        /// <param name="id">Profile id.</param>
+        /// <returns>Status.</returns>
+        [HttpDelete("Profiles/{Id}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult DeleteProfile([FromRoute] string id)
+        {
+            var existingDeviceProfile = _dlnaManager.GetProfile(id);
+            if (existingDeviceProfile == null)
+            {
+                return NotFound();
+            }
+
+            _dlnaManager.DeleteProfile(id);
+            return Ok();
+        }
+
+        /// <summary>
+        /// Creates a profile.
+        /// </summary>
+        /// <param name="deviceProfile">Device profile.</param>
+        /// <returns>Status.</returns>
+        [HttpPost("Profiles")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public ActionResult CreateProfile([FromBody] DeviceProfile deviceProfile)
+        {
+            _dlnaManager.CreateProfile(deviceProfile);
+            return Ok();
+        }
+
+        /// <summary>
+        /// Updates a profile.
+        /// </summary>
+        /// <param name="id">Profile id.</param>
+        /// <param name="deviceProfile">Device profile.</param>
+        /// <returns>Status.</returns>
+        [HttpPost("Profiles/{Id}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        public ActionResult UpdateProfile([FromRoute] string id, [FromBody] DeviceProfile deviceProfile)
+        {
+            var existingDeviceProfile = _dlnaManager.GetProfile(id);
+            if (existingDeviceProfile == null)
+            {
+                return NotFound();
+            }
+
+            _dlnaManager.UpdateProfile(deviceProfile);
+            return Ok();
+        }
+    }
+}