diff --git a/eduserver/input/input.go b/eduserver/input/input.go
index b0198f8b8..a749f3aa5 100644
--- a/eduserver/input/input.go
+++ b/eduserver/input/input.go
@@ -25,6 +25,7 @@ import (
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"
+	"github.com/sirupsen/logrus"
 )
 
 // EDUServerInputAPI implements api.EDUServerInputAPI
@@ -112,8 +113,15 @@ func (t *EDUServerInputAPI) sendToDeviceEvent(ise *api.InputSendToDeviceEvent) e
 		},
 	}
 
+	logrus.WithFields(logrus.Fields{
+		"user_id":    ise.UserID,
+		"device_id":  ise.DeviceID,
+		"event_type": ise.EventType,
+	}).Error("sendToDevice")
+
 	eventJSON, err := json.Marshal(ote)
 	if err != nil {
+		logrus.WithError(err).Error("sendToDevice failed json.Marshal")
 		return err
 	}
 
@@ -124,6 +132,9 @@ func (t *EDUServerInputAPI) sendToDeviceEvent(ise *api.InputSendToDeviceEvent) e
 	}
 
 	_, _, err = t.Producer.SendMessage(m)
+	if err != nil {
+		logrus.WithError(err).Error("sendToDevice failed t.Producer.SendMessage")
+	}
 	return err
 }
 
diff --git a/syncapi/consumers/eduserver_sendtodevice.go b/syncapi/consumers/eduserver_sendtodevice.go
index 08221a7dd..3c8be703e 100644
--- a/syncapi/consumers/eduserver_sendtodevice.go
+++ b/syncapi/consumers/eduserver_sendtodevice.go
@@ -25,6 +25,7 @@ import (
 	"github.com/matrix-org/dendrite/syncapi/storage"
 	"github.com/matrix-org/dendrite/syncapi/sync"
 	"github.com/matrix-org/dendrite/syncapi/types"
+	"github.com/sirupsen/logrus"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -63,15 +64,18 @@ func NewOutputSendToDeviceEventConsumer(
 
 // Start consuming from EDU api
 func (s *OutputSendToDeviceEventConsumer) Start() error {
+	logrus.Info("syncapi starting sendToDevice consumer")
 	return s.sendToDeviceConsumer.Start()
 }
 
 func (s *OutputSendToDeviceEventConsumer) onMessage(msg *sarama.ConsumerMessage) error {
+	logrus.Info("syncapi received sendToDevice event")
+
 	var output api.OutputSendToDeviceEvent
 	if err := json.Unmarshal(msg.Value, &output); err != nil {
 		// If the message was invalid, log it and move on to the next message in the stream
 		log.WithError(err).Errorf("EDU server output log: message parse failure")
-		return nil
+		return err
 	}
 
 	log.WithFields(log.Fields{