diff --git a/Service.EDMIService/Methods/Database/GetScalarValue/GetScalarValueMethod.vb b/Service.EDMIService/Methods/Database/GetScalarValue/GetScalarValueMethod.vb
index ecf90fca..073d3d1b 100644
--- a/Service.EDMIService/Methods/Database/GetScalarValue/GetScalarValueMethod.vb
+++ b/Service.EDMIService/Methods/Database/GetScalarValue/GetScalarValueMethod.vb
@@ -40,9 +40,10 @@ Namespace Methods.Database.GetScalarValue
 
                 End Select
 
-                If oResult Is Nothing Then
-                    LogAndThrow($"SQL Command did not return any results: [{pData.SqlCommand}]!")
-                End If
+                ' Remove this in the future, empty return values for scalar should be allowed
+                'If oResult Is Nothing Then
+                '    LogAndThrow($"SQL Command did not return any results: [{pData.SqlCommand}]!")
+                'End If
 
                 Return New GetScalarValueResponse(oResult)
             Catch ex As Exception