diff --git a/application/libraries/ProfilLib.php b/application/libraries/ProfilLib.php
index 17d2218ad..70a8717db 100644
--- a/application/libraries/ProfilLib.php
+++ b/application/libraries/ProfilLib.php
@@ -34,6 +34,7 @@ class ProfilLib{
 				$res->data = $this->studentProfil();
 				$res->data->pid = getAuthPersonId();
 			}
+			$res->data->fotoStatus=$this->isFotoAkzeptiert(getAuthPersonId());
 		}
 		// UID is availabe when accessing Profil/View/:uid
 		else {
@@ -53,7 +54,7 @@ class ProfilLib{
 				$res->data = $this->viewStudentProfil($uid);
 			}
 		}
-		$res->data->fotoStatus=$this->isFotoAkzeptiert(getAuthPersonId());
+		
 		return success($res);
 	}
 
diff --git a/data- b/data-
new file mode 100644
index 000000000..e69de29bb
diff --git a/fotoStatus b/fotoStatus
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/js/components/Cis/Profil/MitarbeiterProfil.js b/public/js/components/Cis/Profil/MitarbeiterProfil.js
index 873984c1b..8eaae6dd9 100644
--- a/public/js/components/Cis/Profil/MitarbeiterProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterProfil.js
@@ -216,7 +216,7 @@ export default {
 
 	computed: {
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 		getTelefonValue() {
 			if(this.data.standort_telefon?.kontakt) {
diff --git a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
index 4d2b080b6..c1ce4ead6 100644
--- a/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
+++ b/public/js/components/Cis/Profil/MitarbeiterViewProfil.js
@@ -111,7 +111,7 @@ export default {
 			}
 		},
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 
 		personEmails() {
diff --git a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
index 438b3cca8..5dd4a6969 100644
--- a/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
+++ b/public/js/components/Cis/Profil/ProfilComponents/ProfilInformation.js
@@ -93,7 +93,7 @@ export default {
                         <div v-if="isEditable" role="button" @click.prevent="sperre_foto_function" class="image-lock">
                             <i :class="{'fa':true, ...(FotoSperre?{'fa-lock':true}:{'fa-lock-open':true})} "></i>
                         </div>
-						<div v-if="!fotoStatus" role="button" @click.prevent="showModal" class="image-upload">
+						<div v-if="fotoStatus != null && !fotostatus" role="button" @click.prevent="showModal" class="image-upload">
                             <i class="fa fa-upload"></i>
                         </div>
                     </div>
diff --git a/public/js/components/Cis/Profil/StudentProfil.js b/public/js/components/Cis/Profil/StudentProfil.js
index 480130cbb..cc0068411 100644
--- a/public/js/components/Cis/Profil/StudentProfil.js
+++ b/public/js/components/Cis/Profil/StudentProfil.js
@@ -165,7 +165,7 @@ export default {
 	computed: {
 		
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 
 		filteredEditData() {
diff --git a/public/js/components/Cis/Profil/StudentViewProfil.js b/public/js/components/Cis/Profil/StudentViewProfil.js
index ccc55362e..2ce649dae 100644
--- a/public/js/components/Cis/Profil/StudentViewProfil.js
+++ b/public/js/components/Cis/Profil/StudentViewProfil.js
@@ -27,7 +27,7 @@ export default {
 
 	computed: {
 		fotoStatus() {
-			return this.data?.fotoStatus ?? false;
+			return this.data?.fotoStatus ?? null;
 		},
 		profilInformation() {
 			if (!this.data) {