diff --git a/Backend/Api/Auth/Login.go b/Backend/Api/Auth/Login.go
index 15c42a7..44f26e7 100644
--- a/Backend/Api/Auth/Login.go
+++ b/Backend/Api/Auth/Login.go
@@ -43,7 +43,6 @@ func makeLoginResponse(w http.ResponseWriter, code int, message, pubKey, privKey
 	}, "", "  ")
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
diff --git a/Backend/Api/Auth/Signup.go b/Backend/Api/Auth/Signup.go
index 232611f..57509ab 100644
--- a/Backend/Api/Auth/Signup.go
+++ b/Backend/Api/Auth/Signup.go
@@ -32,7 +32,6 @@ func makeSignupResponse(w http.ResponseWriter, code int, message string) {
 	}, "", "  ")
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
diff --git a/Backend/Api/Friends/AcceptFriendRequest.go b/Backend/Api/Friends/AcceptFriendRequest.go
index 8ba80d1..adfa0e5 100644
--- a/Backend/Api/Friends/AcceptFriendRequest.go
+++ b/Backend/Api/Friends/AcceptFriendRequest.go
@@ -33,7 +33,6 @@ func AcceptFriendRequest(w http.ResponseWriter, r *http.Request) {
 	oldFriendRequest, err = Database.GetFriendRequestByID(friendRequestID)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
@@ -43,21 +42,18 @@ func AcceptFriendRequest(w http.ResponseWriter, r *http.Request) {
 	requestBody, err = ioutil.ReadAll(r.Body)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	err = json.Unmarshal(requestBody, &newFriendRequest)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	err = Database.UpdateFriendRequest(&oldFriendRequest)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
@@ -67,7 +63,6 @@ func AcceptFriendRequest(w http.ResponseWriter, r *http.Request) {
 	err = Database.CreateFriendRequest(&newFriendRequest)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
diff --git a/Backend/Api/Friends/Friends.go b/Backend/Api/Friends/Friends.go
index 3327e10..a1db196 100644
--- a/Backend/Api/Friends/Friends.go
+++ b/Backend/Api/Friends/Friends.go
@@ -22,14 +22,12 @@ func CreateFriendRequest(w http.ResponseWriter, r *http.Request) {
 	requestBody, err = ioutil.ReadAll(r.Body)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	err = json.Unmarshal(requestBody, &friendRequest)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
@@ -38,14 +36,12 @@ func CreateFriendRequest(w http.ResponseWriter, r *http.Request) {
 	err = Database.CreateFriendRequest(&friendRequest)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	returnJSON, err = json.MarshalIndent(friendRequest, "", "  ")
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
@@ -66,14 +62,12 @@ func CreateFriendRequestQrCode(w http.ResponseWriter, r *http.Request) {
 	requestBody, err = ioutil.ReadAll(r.Body)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	err = json.Unmarshal(requestBody, &friendRequests)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
@@ -85,7 +79,6 @@ func CreateFriendRequestQrCode(w http.ResponseWriter, r *http.Request) {
 	err = Database.CreateFriendRequests(&friendRequests)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
diff --git a/Backend/Api/Friends/RejectFriendRequest.go b/Backend/Api/Friends/RejectFriendRequest.go
index b1b2c87..e341858 100644
--- a/Backend/Api/Friends/RejectFriendRequest.go
+++ b/Backend/Api/Friends/RejectFriendRequest.go
@@ -29,14 +29,12 @@ func RejectFriendRequest(w http.ResponseWriter, r *http.Request) {
 	friendRequest, err = Database.GetFriendRequestByID(friendRequestID)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
 	err = Database.DeleteFriendRequest(&friendRequest)
 	if err != nil {
 		http.Error(w, "Error", http.StatusInternalServerError)
-		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}