diff --git a/lib/src/client.dart b/lib/src/client.dart
index a0751a3..6282788 100644
--- a/lib/src/client.dart
+++ b/lib/src/client.dart
@@ -1574,7 +1574,7 @@ class Client {
                   deviceKeys.verified &&
                   !deviceKeys.blocked) {
                 await roomKeyRequest.forwardKey();
-              } else {
+              } else if (roomKeyRequest.requestingDevice != null) {
                 onRoomKeyRequest.add(roomKeyRequest);
               }
             }
diff --git a/lib/src/utils/room_key_request.dart b/lib/src/utils/room_key_request.dart
index 8f3d1bd..778e93e 100644
--- a/lib/src/utils/room_key_request.dart
+++ b/lib/src/utils/room_key_request.dart
@@ -22,7 +22,7 @@ class RoomKeyRequest extends ToDeviceEvent {
     for (final key in session.forwardingCurve25519KeyChain) {
       forwardedKeys.add(key);
     }
-    await requestingDevice?.setVerified(true, client);
+    await requestingDevice.setVerified(true, client);
     var message = session.content;
     message['forwarding_curve25519_key_chain'] = forwardedKeys;