diff --git a/contributions/ServerSetup.md b/contributions/ServerSetup.md
index f5a5500d76..bfa18724c7 100644
--- a/contributions/ServerSetup.md
+++ b/contributions/ServerSetup.md
@@ -157,8 +157,25 @@ Please note when setting **Working directory** option. If the path is not correc
3. Load your env file by going to the EnvFile Tab in the Run/Debug configuration settings for your server.
-Happy hacking.
+## Configuration settings for version 2021.1.2 (Community Edition) IntelliJ IDEA
-## Need Assistance?
+After configuring settings as mentioned above, please also add the following to your IntelliJ IDEA setup.
+
+1. [Optional] As shown in the image below, please enable the **Store as Project** checkbox to run the application from the main class specified.
+
+
+2. Please enable the **Always update snapshots** checkbox so that the most recent build is picked up.
+
+
+Happy hacking ✌️
+
+#### Note:
+In case the server doesn't work with the above config, please try re-compiling the code using the steps
+
+```sh
+mvn -B clean compile && ./build.sh -DskipTests
+```
+
+## Need Assistance
- If you are unable to resolve any issue while doing the setup, please feel free to ask questions on our [Discord channel](https://discord.com/invite/rBTTVJp) or initiate a [Github discussion](https://github.com/appsmithorg/appsmith/discussions) or send an email to `support@appsmith.com`. We'll be happy to help you.
- In case you notice any discrepancy, please raise an issue on Github and/or send an email to support@appsmith.com.
diff --git a/contributions/images/intellij_config_1.png b/contributions/images/intellij_config_1.png
new file mode 100644
index 0000000000..58c7c7a05f
Binary files /dev/null and b/contributions/images/intellij_config_1.png differ
diff --git a/contributions/images/intellij_config_2.png b/contributions/images/intellij_config_2.png
new file mode 100644
index 0000000000..f83b880e0f
Binary files /dev/null and b/contributions/images/intellij_config_2.png differ