diff --git a/src/kits/media/MediaRecorder.cpp b/src/kits/media/MediaRecorder.cpp
index 665bbf0fbd..dd3347cbd5 100644
--- a/src/kits/media/MediaRecorder.cpp
+++ b/src/kits/media/MediaRecorder.cpp
@@ -413,13 +413,11 @@ BMediaRecorder::_Connect(const media_node& node,
 	if (ourOutput.source == media_source::null)
 		return B_MEDIA_BAD_SOURCE;
 
-	fOutputSource = ourOutput.source;
-
 	// find our Node's free input
 	media_input ourInput;
 	fNode->GetInput(&ourInput);
 
-	return BMediaRoster::CurrentRoster()->Connect(fOutputSource,
+	return BMediaRoster::CurrentRoster()->Connect(ourOutput.source,
 		ourInput.destination, &ourFormat, &ourOutput, &ourInput,
 		BMediaRoster::B_CONNECT_MUTED);
 }
diff --git a/src/kits/media/MediaRecorderNode.cpp b/src/kits/media/MediaRecorderNode.cpp
index 6a7a3a53ca..40371ac43a 100644
--- a/src/kits/media/MediaRecorderNode.cpp
+++ b/src/kits/media/MediaRecorderNode.cpp
@@ -104,6 +104,7 @@ BMediaRecorderNode::SetAcceptedFormat(const media_format& format)
 {
 	CALLED();
 
+	fInput.format = format;
 	fOKFormat = format;
 }
 
@@ -113,7 +114,7 @@ BMediaRecorderNode::AcceptedFormat() const
 {
 	CALLED();
 
-	return fOKFormat;
+	return fInput.format;
 }