diff --git a/cannamanage-api/pom.xml b/cannamanage-api/pom.xml
index 1e20ee0..79980d8 100644
--- a/cannamanage-api/pom.xml
+++ b/cannamanage-api/pom.xml
@@ -123,6 +123,11 @@
org.springframework.boot
spring-boot-starter-actuator
+
+
+ org.springframework.boot
+ spring-boot-starter-websocket
+
diff --git a/cannamanage-api/src/main/java/de/cannamanage/api/config/WebSocketConfig.java b/cannamanage-api/src/main/java/de/cannamanage/api/config/WebSocketConfig.java
new file mode 100644
index 0000000..26962a3
--- /dev/null
+++ b/cannamanage-api/src/main/java/de/cannamanage/api/config/WebSocketConfig.java
@@ -0,0 +1,34 @@
+package de.cannamanage.api.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+/**
+ * WebSocket configuration — enables STOMP messaging over SockJS.
+ * Clients connect to /ws, subscribe to /user/queue/notifications for personal notifications.
+ */
+@Configuration
+@EnableWebSocketMessageBroker
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+ @Override
+ public void configureMessageBroker(MessageBrokerRegistry config) {
+ // Enable simple in-memory broker for /topic (broadcast) and /queue (user-specific)
+ config.enableSimpleBroker("/topic", "/queue");
+ // Prefix for @MessageMapping methods
+ config.setApplicationDestinationPrefixes("/app");
+ // User-specific destination prefix
+ config.setUserDestinationPrefix("/user");
+ }
+
+ @Override
+ public void registerStompEndpoints(StompEndpointRegistry registry) {
+ // WebSocket endpoint with SockJS fallback
+ registry.addEndpoint("/ws")
+ .setAllowedOriginPatterns("*")
+ .withSockJS();
+ }
+}
diff --git a/cannamanage-api/src/main/java/de/cannamanage/api/controller/NotificationController.java b/cannamanage-api/src/main/java/de/cannamanage/api/controller/NotificationController.java
new file mode 100644
index 0000000..e5dcf82
--- /dev/null
+++ b/cannamanage-api/src/main/java/de/cannamanage/api/controller/NotificationController.java
@@ -0,0 +1,68 @@
+package de.cannamanage.api.controller;
+
+import de.cannamanage.domain.entity.Notification;
+import de.cannamanage.service.NotificationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * REST endpoints for notification management.
+ */
+@RestController
+@RequestMapping("/api/v1/notifications")
+@RequiredArgsConstructor
+public class NotificationController {
+
+ private final NotificationService notificationService;
+
+ /**
+ * Get current user's notifications (last 10, unread first).
+ */
+ @GetMapping
+ public ResponseEntity