diff --git a/hypha/static_src/src/app/src/containers/Determination.js b/hypha/static_src/src/app/src/containers/Determination.js
index 662486338ea58de3a6229eb0b1536f5b13149dd1..f4ec2cd3deaaf643e4315104361190613bb401d1 100644
--- a/hypha/static_src/src/app/src/containers/Determination.js
+++ b/hypha/static_src/src/app/src/containers/Determination.js
@@ -34,10 +34,18 @@ class DeterminationContainer extends React.PureComponent {
                     
                 </>
                 }
-                {this.props.determinationDraftStatus && 
-                <div className="status-actions"><button onClick = {() =>  this.props.toggleDeterminationForm(true)} className="button button--primary button--half-width">Update draft</button></div>}
-                {!this.props.determinationDraftStatus && 
-                this.props.submission.actionButtons.addDetermination && <div className="status-actions"><button onClick = {() =>  this.props.toggleDeterminationForm(true)} className="button button--primary button--full-width">Add determination</button></div>}
+                {this.props.submission.actionButtons.showDeterminationButton && this.props.determinationDraftStatus && 
+                <div className="status-actions">
+                    <button onClick = {() =>  this.props.toggleDeterminationForm(true)} className="button button--primary button--half-width">
+                        Update draft
+                    </button>
+                </div>}
+                { this.props.submission.actionButtons.showDeterminationButton && !this.props.determinationDraftStatus &&
+                <div className="status-actions">
+                    <button onClick = {() =>  this.props.toggleDeterminationForm(true)} className="button button--primary button--full-width">
+                        Add determination
+                    </button>
+                </div>}
             </SidebarBlock>
            : null
            }
diff --git a/hypha/static_src/src/app/src/containers/DisplayPanel/index.js b/hypha/static_src/src/app/src/containers/DisplayPanel/index.js
index 48d4a144e86dcae18991ac429f982f270e0c20c0..139337f2bce1a16b53fcc1b700cc5ed51785ac52 100644
--- a/hypha/static_src/src/app/src/containers/DisplayPanel/index.js
+++ b/hypha/static_src/src/app/src/containers/DisplayPanel/index.js
@@ -70,7 +70,8 @@ const DisplayPanel = props => {
 
     let tabs = [
         <Tab button="Status" key="status">
-            <Determination submissionID={submissionID} submission={submission}/>
+           { submission ? submission.isDeterminationFormAttached &&
+            <Determination submissionID={submissionID} submission={submission}/> : null}
             <ScreeningOutcome submissionID={submissionID} />
             <StatusActions submissionID={submissionID} />
             <ReviewInformation submissionID={submissionID} />