diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java
index eefcb890b6..6afbf9256b 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubClassComposer.java
@@ -159,7 +159,7 @@ private static MethodDefinition createCallableGetterHelper(
             (isLroCallable ? "Operation" : isPaged ? "Paged" : ""));
     List<Reference> genericRefs = new ArrayList<>();
     genericRefs.add(method.inputType().reference());
-    if (method.hasLro()) {
+    if (method.hasLro() && isLroCallable) {
       genericRefs.add(method.lro().responseType().reference());
       genericRefs.add(method.lro().metadataType().reference());
     } else if (isPaged) {
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
index cd40a257e0..217d4375b7 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
@@ -71,6 +71,7 @@ public void generateServiceClasses() {
           + "import com.google.api.gax.rpc.OperationCallable;\n"
           + "import com.google.api.gax.rpc.ServerStreamingCallable;\n"
           + "import com.google.api.gax.rpc.UnaryCallable;\n"
+          + "import com.google.longrunning.Operation;\n"
           + "import com.google.longrunning.stub.OperationsStub;\n"
           + "import com.google.showcase.v1beta1.BlockRequest;\n"
           + "import com.google.showcase.v1beta1.BlockResponse;\n"
@@ -120,8 +121,8 @@ public void generateServiceClasses() {
           + " chatAgainCallable()\");\n"
           + "  }\n"
           + "\n"
-          + "  public UnaryCallable<PagedExpandRequest, PagedExpandPagedResponse> pagedExpandPagedCallable()"
-          + " {\n"
+          + "  public UnaryCallable<PagedExpandRequest, PagedExpandPagedResponse>"
+          + " pagedExpandPagedCallable() {\n"
           + "    throw new UnsupportedOperationException(\"Not implemented:"
           + " pagedExpandPagedCallable()\");\n"
           + "  }\n"
@@ -138,7 +139,7 @@ public void generateServiceClasses() {
           + " waitOperationCallable()\");\n"
           + "  }\n"
           + "\n"
-          + "  public UnaryCallable<WaitRequest, WaitResponse, WaitMetadata> waitCallable() {\n"
+          + "  public UnaryCallable<WaitRequest, Operation> waitCallable() {\n"
           + "    throw new UnsupportedOperationException(\"Not implemented: waitCallable()\");\n"
           + "  }\n"
           + "\n"