diff --git a/modules/juce_midi_ci/ci/juce_CIDevice.cpp b/modules/juce_midi_ci/ci/juce_CIDevice.cpp
index 2a4f685b98..0bd7307781 100644
--- a/modules/juce_midi_ci/ci/juce_CIDevice.cpp
+++ b/modules/juce_midi_ci/ci/juce_CIDevice.cpp
@@ -927,7 +927,6 @@ private:
                         device->listeners.call ([source, &data] (auto& l) { l.propertySubscriptionDataReceived (source, data); });
 
                     PropertyReplyHeader header;
-                    header.extended["subscribeId"] = subscribeId;
                     const auto headerBytes = Encodings::jsonTo7BitText (header.toVarCondensed());
 
                     detail::MessageTypeUtils::send (device->concreteBufferOutput,
@@ -1192,6 +1191,9 @@ private:
         if (! primed.isValid())
             return;
 
+        // TODO(reuk) this isn't ideal, make subscription/request handling more robust
+        primed.token.release();
+
         detail::PropertyHostUtils::send (concreteBufferOutput,
                                          options.getFunctionBlock().firstGroup,
                                          detail::MessageMeta::Meta<Message::PropertySubscribe>::subID2,