diff --git a/src/emotemanager.cpp b/src/emotemanager.cpp
index 9ff7690b9..1b60a6037 100644
--- a/src/emotemanager.cpp
+++ b/src/emotemanager.cpp
@@ -1,5 +1,6 @@
 #include "emotemanager.hpp"
 #include "common.hpp"
+#include "settingsmanager.hpp"
 #include "util/urlfetch.hpp"
 #include "windowmanager.hpp"
 
@@ -528,8 +529,10 @@ boost::signals2::signal<void()> &EmoteManager::getGifUpdateSignal()
         _gifUpdateTimer.start();
 
         QObject::connect(&_gifUpdateTimer, &QTimer::timeout, [this] {
-            _gifUpdateTimerSignal();
-            WindowManager::instance->repaintGifEmotes();
+            if (SettingsManager::getInstance().enableGifAnimations.getValue()) {
+                _gifUpdateTimerSignal();
+                WindowManager::instance->repaintGifEmotes();
+            }
         });
     }
 
diff --git a/src/windowmanager.cpp b/src/windowmanager.cpp
index 3ef4e07b2..80cd9b4dc 100644
--- a/src/windowmanager.cpp
+++ b/src/windowmanager.cpp
@@ -2,6 +2,7 @@
 #include "appdatapath.hpp"
 #include "channelmanager.hpp"
 #include "colorscheme.hpp"
+#include "settingsmanager.hpp"
 
 #include <QDebug>
 #include <QStandardPaths>