diff --git a/charger/ocpp.go b/charger/ocpp.go
index 84b42c6ad..34bb02b1b 100644
--- a/charger/ocpp.go
+++ b/charger/ocpp.go
@@ -162,13 +162,7 @@ func NewOCPP(id string, connector int, idTag string,
 		stackLevelZero: stackLevelZero,
 	}
 
-	if cp.HasRemoteTriggerFeature {
-		if err := conn.TriggerMessageRequest(core.StatusNotificationFeatureName); err != nil {
-			c.log.DEBUG.Printf("failed triggering StatusNotification: %v", err)
-		}
-
-		go conn.WatchDog(10 * time.Second)
-	}
+	go conn.WatchDog(10 * time.Second)
 
 	return c, conn.Initialized()
 }
diff --git a/charger/ocpp/cp_setup.go b/charger/ocpp/cp_setup.go
index 1dfa35da8..f85902362 100644
--- a/charger/ocpp/cp_setup.go
+++ b/charger/ocpp/cp_setup.go
@@ -156,6 +156,13 @@ func (cp *CP) Setup(meterValues string, meterInterval time.Duration) error {
 		cp.log.DEBUG.Printf("failed configuring %s: %v", KeyWebSocketPingInterval, err)
 	}
 
+	// trigger status for all connectors
+	if cp.HasRemoteTriggerFeature {
+		if err := cp.TriggerMessageRequest(0, core.StatusNotificationFeatureName); err != nil {
+			cp.log.WARN.Printf("failed triggering StatusNotification: %v", err)
+		}
+	}
+
 	return nil
 }