diff --git a/include/cscore_oo.inl b/include/cscore_oo.inl
index f2fd374830..890d4fa4cd 100644
--- a/include/cscore_oo.inl
+++ b/include/cscore_oo.inl
@@ -427,7 +427,8 @@ inline void VideoSink::SetSource(VideoSource source) {
 
 inline VideoSource VideoSink::GetSource() const {
   m_status = 0;
-  return VideoSource{GetSinkSource(m_handle, &m_status)};
+  auto handle = GetSinkSource(m_handle, &m_status);
+  return VideoSource{handle == 0 ? 0 : CopySource(handle, &m_status)};
 }
 
 inline VideoProperty VideoSink::GetSourceProperty(llvm::StringRef name) {