diff --git a/db/src/main.go b/db/src/main.go
index af85113..358a077 100644
--- a/db/src/main.go
+++ b/db/src/main.go
@@ -125,8 +125,13 @@ func main() {
 		campus, campusOk := mapping.GetCampus(gatewayID)
 		room, roomOk := mapping.GetRoom(nodeID)
 
-		if !campusOk || !roomOk {
-			log.Printf("[Main] No mapping found for gateway=%s node=%s, dropping datapoint\n", gatewayID, nodeID)
+		if !campusOk {
+			log.Printf("[Main] No mapping found for gateway=%s, dropping datapoint\n", gatewayID)
+			return
+		}
+
+		if !roomOk {
+			log.Printf("[Main] No mapping found for gateway=%s, dropping datapoint\n", gatewayID)
 			return
 		}