diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
index 6b13ca9..15f4825 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ButtonDimmerController.java
@@ -31,6 +31,11 @@ public class ButtonDimmerController
         this.buttonDimmerRepository = inputRepository;
     }
 
+    @GetMapping("/{id}")
+    public ButtonDimmer findById(@PathVariable("id") long id) throws NotFoundException {
+        return buttonDimmerRepository.findById(id).orElseThrow(NotFoundException::new);
+    }
+
     @PostMapping
     public ButtonDimmer create(
             @Valid @RequestBody final GenericDeviceSaveReguest bd, final Principal principal)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
index 9b30535..a8333f5 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/KnobDimmerController.java
@@ -27,6 +27,11 @@ public class KnobDimmerController extends InputDeviceConnectionController<KnobDi
         this.knobDimmerRepository = inputRepository;
     }
 
+    @GetMapping("/{id}")
+    public KnobDimmer findById(@PathVariable("id") long id) throws NotFoundException {
+        return knobDimmerRepository.findById(id).orElseThrow(NotFoundException::new);
+    }
+
     @PostMapping
     public KnobDimmer create(
             @Valid @RequestBody GenericDeviceSaveReguest kd, final Principal principal)
diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
index 0847c87..50d63e0 100644
--- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
+++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/SwitchController.java
@@ -37,6 +37,11 @@ public class SwitchController extends InputDeviceConnectionController<Switch, Sw
         this.switchRepository = inputRepository;
     }
 
+    @GetMapping("/{id}")
+    public Switch findById(@PathVariable("id") long id) throws NotFoundException {
+        return switchRepository.findById(id).orElseThrow(NotFoundException::new);
+    }
+
     @PostMapping
     public Switch create(@Valid @RequestBody GenericDeviceSaveReguest s, final Principal principal)
             throws NotFoundException {