diff --git a/src/providers/LinkResolver.cpp b/src/providers/LinkResolver.cpp
index c781b5db..f48834ef 100644
--- a/src/providers/LinkResolver.cpp
+++ b/src/providers/LinkResolver.cpp
@@ -3,6 +3,7 @@
 #include "common/Common.hpp"
 #include "common/NetworkRequest.hpp"
 #include "messages/Link.hpp"
+#include "singletons/Settings.hpp"
 
 #include <QString>
 
@@ -24,7 +25,9 @@ void LinkResolver::getLinkInfo(const QString url,
         QString linkString = url;
         if (statusCode == 200) {
             response = root.value("tooltip").toString();
-            linkString = root.value("link").toString();
+            if (getSettings()->enableUnshortLinks) {
+                linkString = root.value("link").toString();
+            }
         } else {
             response = root.value("message").toString();
         }
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 2ec96101..72bd0ce0 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -104,6 +104,7 @@ public:
     /// Links
     BoolSetting linksDoubleClickOnly = {"/links/doubleClickToOpen", false};
     BoolSetting enableLinkInfoTooltip = {"/links/linkInfoTooltip", false};
+    BoolSetting enableUnshortLinks = {"/links/unshortLinks", false};
     BoolSetting enableLowercaseLink = {"/links/linkLowercase", true};
 
     /// Ingored Users
diff --git a/src/widgets/settingspages/FeelPage.cpp b/src/widgets/settingspages/FeelPage.cpp
index b87a2d09..cab08ebc 100644
--- a/src/widgets/settingspages/FeelPage.cpp
+++ b/src/widgets/settingspages/FeelPage.cpp
@@ -53,6 +53,9 @@ FeelPage::FeelPage()
         form->addRow("",
                      this->createCheckBox("Show link info in tooltips",
                                           getSettings()->enableLinkInfoTooltip));
+        form->addRow("",
+                     this->createCheckBox("Auto unshort links (requires restart)",
+                                          getSettings()->enableUnshortLinks));
     }
 
     layout->addSpacing(16);