diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 63c388cb1..ae26830b1 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -1260,7 +1260,7 @@ class AppController extends Controller
 
     private function __sessionMassage()
     {
-        if (!empty(Configure::read('MISP.uuid'))) {
+        if (empty(Configure::read('Session.cookie')) && !empty(Configure::read('MISP.uuid'))) {
             Configure::write('Session.cookie', 'MISP-' . Configure::read('MISP.uuid'));
         }
         if (!empty(Configure::read('Session.cookieTimeout')) || !empty(Configure::read('Session.timeout'))) {