diff --git a/static/scripts/topicEdit.js b/static/scripts/topicEdit.js
index 1865c3b438..1a71490199 100644
--- a/static/scripts/topicEdit.js
+++ b/static/scripts/topicEdit.js
@@ -326,7 +326,6 @@ class TopicBlockList extends React.Component {
      * Render the list items.
      */
 	render() {
-		const neXboardEnabled = ($contentBlocksContainer.data('nexboardenabled') === true);
 		const h5pEditorEnabled = ($contentBlocksContainer.data('h5peditorenabled') === true);
 		return (
             <div>
@@ -364,7 +363,7 @@ class TopicBlockList extends React.Component {
 							onClick={this.addBlock.bind(this, TopicGeoGebra)}>
 								{`+ ${$t('topic.topicEdit.button.geoGebraWorksheet')}`}
 						</button>
-                        <button
+						<button
 							type="button"
 							className="btn btn-secondary"
 							data-testid="topic-addcontent-material-btn"
@@ -372,14 +371,6 @@ class TopicBlockList extends React.Component {
 							onClick={this.addBlock.bind(this, TopicResources)}>
 								{`+ ${$t('topic.topicEdit.button.material')}`}
 						</button>
-						{neXboardEnabled ? <button
-							type="button"
-							className="btn btn-secondary"
-							data-testid="topic-addcontent-nexboard-btn"
-							aria-label={$t('global.button.add')}
-							onClick={this.addBlock.bind(this, TopicNexboard)}>
-								{`+ ${$t('topic.topicEdit.button.neXboard')}`}
-							</button> : '' }
 						<button
 							type="button"
 							className="btn btn-secondary"
@@ -388,7 +379,7 @@ class TopicBlockList extends React.Component {
 							onClick={this.addBlock.bind(this, TopicEtherpad)}>
 								{`+ ${$t('topic.topicEdit.button.etherpad')}`}
 						</button>
-                        <button
+						<button
 							type="button"
 							className="btn btn-secondary"
 							data-testid="topic-addcontent-task-btn"
@@ -403,7 +394,7 @@ class TopicBlockList extends React.Component {
 							aria-label={$t('global.button.add')}
 							onClick={this.addBlock.bind(this, TopicH5P)}>
 								{`+ ${$t('topic.topicEdit.button.h5p')}`}
-							</button> : ''
+						</button> : ''
 						}
                     </div>
                 </div>
diff --git a/views/topic/edit-topic.hbs b/views/topic/edit-topic.hbs
index 30360dbb38..de09bbca0e 100644
--- a/views/topic/edit-topic.hbs
+++ b/views/topic/edit-topic.hbs
@@ -44,10 +44,9 @@
 
                 <div class="form-group">
                     <label>{{$t "topic._topic.label.content" }}</label>
-
                     <!-- React Magic -->
                     <div id="content-blocks" data-value="{{lesson.contents}}" data-parent-id="{{lesson._id}}" data-school-id="{{schoolId}}" data-parent-type="lessons" data-etherpadbaseurl="{{etherpadBaseUrl}}"
-                        data-iscoursegroup="{{courseGroupId}}" data-nexboardenabled="{{#ifEnv "FEATURE_NEXBOARD_ENABLED" "true"}}true{{/ifEnv}}" data-h5peditorenabled="{{#ifConfig "FEATURE_H5P_EDITOR_ENABLED" true}}true{{/ifConfig}}"></div>
+                        data-iscoursegroup="{{courseGroupId}}" data-h5peditorenabled="{{#ifConfig "FEATURE_H5P_EDITOR_ENABLED" true}}true{{/ifConfig}}"></div>
                 </div>
                 {{#ifneq 0 (arrayLength @root.lessonFilesStorageData.files)}}
                 <label>{{$t "topic._topic.label.embeddedFiles" }}</label>