diff --git a/app/models/setting.js b/app/models/setting.js
index bb2256fd8f9..d00a9c1cd63 100644
--- a/app/models/setting.js
+++ b/app/models/setting.js
@@ -74,6 +74,8 @@ export default ModelBase.extend({
   facebookUrl                : attr('string'),
   instagramUrl               : attr('string'),
   patreonUrl                 : attr('string'),
+  gitterUrl                  : attr('string'),
+  telegramUrl                : attr('string'),
   youtubeUrl                 : attr('string'),
   androidAppUrl              : attr('string'),
   frontendUrl                : attr('string'),
@@ -106,6 +108,8 @@ export default ModelBase.extend({
   segmentedFacebookUrl   : computedSegmentedLink.bind(this)('facebookUrl'),
   segmentedInstagramUrl  : computedSegmentedLink.bind(this)('instagramUrl'),
   segmentedPatreonUrl    : computedSegmentedLink.bind(this)('patreonUrl'),
+  segmentedGitterUrl     : computedSegmentedLink.bind(this)('gitterUrl'),
+  segmentedTelegramUrl   : computedSegmentedLink.bind(this)('telegramUrl'),
   segmentedTwitterUrl    : computedSegmentedLink.bind(this)('twitterUrl'),
   segmentedGoogleUrl     : computedSegmentedLink.bind(this)('googleUrl'),
   segmentedYoutubeUrl    : computedSegmentedLink.bind(this)('youtubeUrl'),
diff --git a/app/templates/components/footer-main.hbs b/app/templates/components/footer-main.hbs
index 02f4f627ee7..d6d1beaad63 100644
--- a/app/templates/components/footer-main.hbs
+++ b/app/templates/components/footer-main.hbs
@@ -80,6 +80,16 @@
             <i class="patreon icon"></i> {{t 'Patreon'}}
           </a>
         {{/if}}
+        {{#if this.socialLinks.gitterUrl}}
+          <a class="item" href="{{this.socialLinks.gitterUrl}}" target="_blank" rel="noopener noreferrer">
+            <i class="gitter icon"></i> {{t 'Gitter'}}
+          </a>
+        {{/if}}
+        {{#if this.socialLinks.telegramUrl}}
+          <a class="item" href="{{this.socialLinks.telegramUrl}}" target="_blank" rel="noopener noreferrer">
+            <i class="telegram icon"></i> {{t 'Telegram'}}
+          </a>
+        {{/if}}
       </div>
     </div>
   </div>
diff --git a/app/templates/components/forms/admin/content/social-links-form.hbs b/app/templates/components/forms/admin/content/social-links-form.hbs
index bd56a1a2808..9277bf22bd2 100644
--- a/app/templates/components/forms/admin/content/social-links-form.hbs
+++ b/app/templates/components/forms/admin/content/social-links-form.hbs
@@ -61,5 +61,21 @@
       @isSocialLink={{true}}
       @inputId="patreon" />
   </div>
+  <div class="field">
+    <label>{{t 'Gitter'}}</label>
+    <Widgets::Forms::LinkInput
+      @segmentedLink={{this.socials.segmentedGitterUrl}}
+      @linkName="gitter"
+      @isSocialLink={{true}}
+      @inputId="gitter" />
+  </div>
+  <div class="field">
+    <label>{{t 'Telegram'}}</label>
+    <Widgets::Forms::LinkInput
+      @segmentedLink={{this.socials.segmentedTelegramUrl}}
+      @linkName="telegram"
+      @isSocialLink={{true}}
+      @inputId="telegram" />
+  </div>
   <button class="ui teal button" type="submit">{{t 'Save'}}</button>
 </form>