diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputImageScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputImageScreen.kt
index 7b7da937c..e48dc6c0a 100644
--- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputImageScreen.kt
+++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputImageScreen.kt
@@ -48,7 +48,6 @@ fun InputImageScreen() {
                     uploadState = UploadState.LOADED
                 }
             },
-            onImageClick = {},
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -63,7 +62,6 @@ fun InputImageScreen() {
             onShareButtonClick = {},
             onResetButtonClicked = {},
             onAddButtonClicked = {},
-            onImageClick = {},
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -80,7 +78,6 @@ fun InputImageScreen() {
             onShareButtonClick = {},
             onResetButtonClicked = { },
             onAddButtonClicked = {},
-            onImageClick = {},
         )
     }
 }
diff --git a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputSignatureScreen.kt b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputSignatureScreen.kt
index 25b93ee4c..34093d0c0 100644
--- a/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputSignatureScreen.kt
+++ b/common/src/commonMain/kotlin/org/hisp/dhis/common/screens/InputSignatureScreen.kt
@@ -48,7 +48,6 @@ fun InputSignatureScreen() {
                     uploadState = UploadState.LOADED
                 }
             },
-            onImageClick = {},
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -63,7 +62,6 @@ fun InputSignatureScreen() {
             onShareButtonClick = {},
             onResetButtonClicked = {},
             onAddButtonClicked = {},
-            onImageClick = {},
         )
         Spacer(Modifier.size(Spacing.Spacing18))
 
@@ -80,7 +78,6 @@ fun InputSignatureScreen() {
             onShareButtonClick = {},
             onResetButtonClicked = { },
             onAddButtonClicked = {},
-            onImageClick = {},
         )
     }
 }
diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicInputImage.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicInputImage.kt
index f42602b95..465900770 100644
--- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicInputImage.kt
+++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/BasicInputImage.kt
@@ -150,10 +150,6 @@ internal fun <T> BasicInputImage(
                                     Spacing.Spacing0
                                 },
                             ),
-                            onImageClick = {
-                                onImageClick.invoke()
-                                focusRequester.requestFocus()
-                            },
                         )
                     }
                 }
diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputImage.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputImage.kt
index 05af0eff5..24e4aeb6c 100644
--- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputImage.kt
+++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputImage.kt
@@ -44,7 +44,6 @@ fun <T> InputImage(
     onShareButtonClick: () -> Unit,
     onResetButtonClicked: () -> Unit,
     onAddButtonClicked: () -> Unit,
-    onImageClick: () -> Unit,
 ) {
     BasicInputImage(
         title = title,
@@ -64,6 +63,5 @@ fun <T> InputImage(
         onShareButtonClick = onShareButtonClick,
         onResetButtonClicked = onResetButtonClicked,
         onAddButtonClicked = onAddButtonClicked,
-        onImageClick = onImageClick,
     )
 }
diff --git a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputSignature.kt b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputSignature.kt
index 5337b6eb7..b95b74481 100644
--- a/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputSignature.kt
+++ b/designsystem/src/commonMain/kotlin/org/hisp/dhis/mobile/ui/designsystem/component/InputSignature.kt
@@ -44,7 +44,6 @@ fun <T> InputSignature(
     onShareButtonClick: () -> Unit,
     onResetButtonClicked: () -> Unit,
     onAddButtonClicked: () -> Unit,
-    onImageClick: () -> Unit,
 ) {
     BasicInputImage(
         title = title,
@@ -64,6 +63,5 @@ fun <T> InputSignature(
         onShareButtonClick = onShareButtonClick,
         onResetButtonClicked = onResetButtonClicked,
         onAddButtonClicked = onAddButtonClicked,
-        onImageClick = onImageClick,
     )
 }