diff --git a/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js b/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
index 6e3a2bcd9..61c47be69 100644
--- a/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
+++ b/src/components/ReferenceSolutions/ReferenceSolutionDetail/ReferenceSolutionDetail.js
@@ -213,7 +213,7 @@ class ReferenceSolutionDetail extends Component {
           files={files}
           openAnotherFile={this.openFile}
           show={openFileId !== null}
-          fileId={openFileId}
+          fileId={openFileId || ''}
           fileName={openFileName}
           zipEntry={openZipEntry}
           isReference={true}
diff --git a/src/components/Solutions/SolutionDetail/SolutionDetail.js b/src/components/Solutions/SolutionDetail/SolutionDetail.js
index 8cdb117ae..90197071f 100644
--- a/src/components/Solutions/SolutionDetail/SolutionDetail.js
+++ b/src/components/Solutions/SolutionDetail/SolutionDetail.js
@@ -261,7 +261,7 @@ class SolutionDetail extends Component {
         <SourceCodeViewerContainer
           solutionId={id}
           show={openFileId !== null}
-          fileId={openFileId}
+          fileId={openFileId || ''}
           fileName={openFileName}
           zipEntry={openZipEntry}
           files={files}