diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6301aa95..a39606a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## [Unreleased]
 
 ### Added
+* Make editorconfig optional [#571](https://github.com/NLeSC/python-template/pull/571)
 * Make contributing guidelines optional [#465]()
 * Make developer documentation optional [#467](https://github.com/NLeSC/python-template/pull/541)
 * Make Code of Conduct optional [#464](https://github.com/NLeSC/python-template/pull/530)
diff --git a/copier/questions/features_code_quality.yml b/copier/questions/features_code_quality.yml
index e85fcdc7..89b53e66 100644
--- a/copier/questions/features_code_quality.yml
+++ b/copier/questions/features_code_quality.yml
@@ -7,7 +7,7 @@ SelectCodeQualityFeatures:
   type: yaml
   default: |-
     {% if template_profile == 'recommended' %}
-      [SelectGitHubActions_flag, not_implemented_linting, AddSonarCloud_flag, not_implemented_editor_config]
+      [SelectGitHubActions_flag, not_implemented_linting, AddSonarCloud_flag, AddEditorConfig_flag]
     {%- else -%}
       []
     {%- endif %}
@@ -26,8 +26,8 @@ SelectCodeQualityFeatures:
     Code analysis (using SonarCloud):
       value: AddSonarCloud_flag
       # validator: "{% if something != 'AnotherThing' %}BlaBla{% endif %}"
-    Editorconfig (NOT_IMPLEMENTED):
-      value: not_implemented_editor_config
+    Editorconfig:
+      value: AddEditorConfig_flag
       # validator: "{% if something != 'AnotherThing' %}BlaBla{% endif %}"
 
 
@@ -80,3 +80,8 @@ AddSonarCloud:
   type: bool
   default: "{{ 'AddSonarCloud_flag' in SelectCodeQualityFeatures }}"
   when: false
+
+AddEditorConfig:
+  type: bool
+  default: "{{ 'AddEditorConfig_flag' in SelectCodeQualityFeatures }}"
+  when: false
diff --git a/template/.editorconfig b/template/{% if AddEditorConfig %}.editorconfig{% endif %}
similarity index 100%
rename from template/.editorconfig
rename to template/{% if AddEditorConfig %}.editorconfig{% endif %}