diff --git a/client/components/ChatInput.vue b/client/components/ChatInput.vue
index 1b8f41ef..2fc4e9dd 100644
--- a/client/components/ChatInput.vue
+++ b/client/components/ChatInput.vue
@@ -13,7 +13,7 @@
 			@keypress.enter.exact.prevent="onSubmit"
 		/>
 		<span
-			v-if="$store.state.isFileUploadEnabled"
+			v-if="$store.state.serverConfiguration.fileUpload"
 			id="upload-tooltip"
 			class="tooltipped tooltipped-w tooltipped-no-touch"
 			aria-label="Upload file"
@@ -147,7 +147,7 @@ export default {
 			return false;
 		});
 
-		if (this.$store.state.isFileUploadEnabled) {
+		if (this.$store.state.serverConfiguration.fileUpload) {
 			upload.mounted();
 		}
 	},
diff --git a/client/js/socket-events/configuration.js b/client/js/socket-events/configuration.js
index 006f5237..825bc0b2 100644
--- a/client/js/socket-events/configuration.js
+++ b/client/js/socket-events/configuration.js
@@ -22,7 +22,6 @@ window.addEventListener("beforeinstallprompt", (installPromptEvent) => {
 });
 
 socket.once("configuration", function(data) {
-	store.commit("isFileUploadEnabled", data.fileUpload);
 	store.commit("serverConfiguration", data);
 
 	// 'theme' setting depends on serverConfiguration.themes so
diff --git a/client/js/store.js b/client/js/store.js
index 9b615c3b..db6e5ba7 100644
--- a/client/js/store.js
+++ b/client/js/store.js
@@ -25,7 +25,6 @@ const store = new Vuex.Store({
 		desktopNotificationState: detectDesktopNotificationState(),
 		isAutoCompleting: false,
 		isConnected: false,
-		isFileUploadEnabled: false,
 		networks: [],
 		pushNotificationState: "unsupported",
 		serverConfiguration: null,
@@ -56,9 +55,6 @@ const store = new Vuex.Store({
 		isConnected(state, payload) {
 			state.isConnected = payload;
 		},
-		isFileUploadEnabled(state, isFileUploadEnabled) {
-			state.isFileUploadEnabled = isFileUploadEnabled;
-		},
 		networks(state, networks) {
 			state.networks = networks;
 		},