diff --git a/js/components/record/Record.js b/js/components/record/Record.js
index 9cc5ec1b..6ec3ac62 100644
--- a/js/components/record/Record.js
+++ b/js/components/record/Record.js
@@ -64,7 +64,7 @@ class Record extends React.Component {
                     {this._showInstitution() && this._renderInstitution()}
                     <RecordProvenance record={record}/>
                 </form>
-                {record.formTemplate && this._renderForm()}
+                {this._renderForm()}
                 {this._renderButtons()}
                 {showAlert && recordSaved.status === ACTION_STATUS.ERROR &&
                 <div>
diff --git a/js/components/record/RecordForm.js b/js/components/record/RecordForm.js
index a05ec9d6..4e63b7f3 100644
--- a/js/components/record/RecordForm.js
+++ b/js/components/record/RecordForm.js
@@ -125,7 +125,7 @@ class RecordForm extends React.Component {
             return <Loader/>;
         }
 
-        return <SForms
+        return !!this.state.form && <SForms
             ref={this.refForm}
             form={this.state.form}
             formData={this.props.record.question}