diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index de34a5f1..034e07c9 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -418,6 +418,11 @@ function upgrade_matrix {
     function_check set_repo_commit
     set_repo_commit /etc/matrix "matrix commit" "$MATRIX_COMMIT" $MATRIX_REPO
     cd /etc/matrix || exit 62476724
+    if [ ! -d /etc/matrix/tmp ]; then
+        mkdir /etc/matrix/tmp
+    fi
+    export TMPDIR=/etc/matrix/tmp
+
     pip install --upgrade --process-dependency-links .
     pip install --upgrade --force "pynacl>=1.2.1"
 
@@ -434,6 +439,11 @@ function upgrade_matrix {
     fi
     systemctl start turn
     systemctl start matrix
+
+    export TMPDIR=/tmp
+    if [ -d /etc/matrix/tmp ]; then
+        rm -rf /etc/matrix/tmp/*
+    fi
 }
 
 function backup_local_matrix {