diff --git a/server/controllers/article/edit-topic.php b/server/controllers/article/edit-topic.php
index 0a0d75ab..4e4adf6b 100755
--- a/server/controllers/article/edit-topic.php
+++ b/server/controllers/article/edit-topic.php
@@ -57,7 +57,7 @@ class EditTopicController extends Controller {
         if(Controller::request('icon')) {
             $topic->icon = Controller::request('icon');
         }
-        if(Controller::request('private') || Controller::request('private') == 0) {
+        if (Controller::request('private') !== null) {
             $topic->private = Controller::request('private');
         }
 
diff --git a/server/controllers/article/get-all.php b/server/controllers/article/get-all.php
index 54aa4214..84bf01e7 100755
--- a/server/controllers/article/get-all.php
+++ b/server/controllers/article/get-all.php
@@ -35,7 +35,11 @@ class GetAllArticlesController extends Controller {
         $topicsArray = [];
 
         foreach($topics as $topic) {
-            Controller::isStaffLogged() ? $topicsArray[] = $topic->toArray() : ($topic->private*1 ? null : $topicsArray[] = $topic->toArray())  ;
+            if (Controller::isStaffLogged()) {
+                $topicsArray[] = $topic->toArray();
+            } else if (!$topic->private) {
+                $topicsArray[] = $topic->toArray();
+            }
         }
 
         Response::respondSuccess($topicsArray);