diff --git a/src/status_im/ui/components/checkbox/view.cljs b/src/status_im/ui/components/checkbox/view.cljs
index 8878eac855..fe9c01730b 100644
--- a/src/status_im/ui/components/checkbox/view.cljs
+++ b/src/status_im/ui/components/checkbox/view.cljs
@@ -10,7 +10,7 @@
   [{:keys [on-value-change checked? accessibility-label
            disabled? style icon-style]
     :or   {accessibility-label :checkbox}}]
-  [react/touchable-highlight
+  [(if on-value-change react/touchable-highlight react/view)
    (merge {:style               (merge
                                  styles/wrapper
                                  style)
@@ -21,4 +21,4 @@
      [icons/tiny-icon
       :tiny-icons/tiny-check {:container-style (styles/icon-check-container true)
                               :color colors/white}]
-     [react/view {:style  (styles/icon-check-container false)}])])
\ No newline at end of file
+     [react/view {:style  (styles/icon-check-container false)}])])
diff --git a/src/status_im/ui/components/list/views.cljs b/src/status_im/ui/components/list/views.cljs
index 1c909220ae..ad3de4ed51 100644
--- a/src/status_im/ui/components/list/views.cljs
+++ b/src/status_im/ui/components/list/views.cljs
@@ -103,7 +103,7 @@
                                       {:on-long-press on-long-press}))
    (conj item
          [react/view {:style (merge style styles/item-checkbox)}
-          [checkbox/checkbox props]])])
+          [checkbox/checkbox (dissoc props :on-value-change)]])])
 
 ;;TODO DEPRECATED, use status-im.ui.components.list-item.views
 (defn list-item-with-radio-button
@@ -323,4 +323,4 @@
   [react/view (merge styles/list-with-label-wrapper style)
    [react/text {:style styles/label}
     label]
-   list])
\ No newline at end of file
+   list])